debian/changelog | 14 ++++++++
debian/control | 19 ++++++++++++
debian/libkms1.install | 1
debian/libkms1.symbols | 13 ++++++++
debian/patches/02_build_libkms_against_in_tree_drm.diff | 25 ++++++++++++++++
debian/patches/series | 1
debian/rules | 6 +++
7 files changed, 77 insertions(+), 2 deletions(-)
New commits:
commit 7eea8050f79d164bd1ffd40a481bb5e30d2dd467
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed May 26 17:31:08 2010 +1000
* Add libkms package
* Enable vmwgfx API; the kernel module is available in 2.6.34
diff --git a/debian/changelog b/debian/changelog
index ee6125e..df4ba46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libdrm (2.4.20-3) UNRELEASED; urgency=low
+ [ Sven Joachim ]
* Update libdrm-nouveau1 to the ABI of Linux 2.6.34.
- Drop 03_revert_abi_change.diff.
- Bump libdrm-nouveau shlibs and symbols versions to 2.4.20-3~
@@ -10,7 +11,18 @@ libdrm (2.4.20-3) UNRELEASED; urgency=low
* Include full SONAME in libdrm-nouveau1.install.
* Update xsfbs to 81fc271788605b52e85c2d11635a0371fb44605e0.
- -- Sven Joachim <svenj...@gmx.de> Sat, 22 May 2010 13:47:34 +0200
+ [ Christopher James Halse Rogers ]
+ * debian/rules:
+ - Add libkms to build
+ - Build vmwgfx experimental API. The drm module is available in the 2.6.34
+ kernel so we might as well build the userspace bits.
+ * debian/control:
+ - Add libkms1, libkms1-dbg packages on linux
+ * debian/patches/02_build_libkms_against_in_tree_drm:
+ - Build libkms against in-tree headers and link against libdrm as it
+ uses symbols from libdrm.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Wed, 26 May 2010
17:03:23 +1000
libdrm (2.4.20-2) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 947dce4..e66caa1 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Depends:
libdrm-intel1 (= ${binary:Version}) [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libdrm-radeon1 (= ${binary:Version}) [linux-any],
libdrm-nouveau1 (= ${binary:Version}) [linux-any],
+ libkms1 (= ${binary:Version}) [linux-any],
${misc:Depends},
Replaces:
linux-libc-dev (<< 2.6.32-10)
@@ -147,3 +148,21 @@ 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}
+Description: Library that abstract aways the different mm interface for kernel
drivers
+ 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}
+Description: Library that abstract aways the different mm interface for kernel
drivers -- 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.
diff --git a/debian/libkms1.install b/debian/libkms1.install
new file mode 100644
index 0000000..e72408b
--- /dev/null
+++ b/debian/libkms1.install
@@ -0,0 +1 @@
+usr/lib/libkms.so.1* /lib
diff --git a/debian/libkms1.symbols b/debian/libkms1.symbols
new file mode 100644
index 0000000..27f5638
--- /dev/null
+++ b/debian/libkms1.symbols
@@ -0,0 +1,13 @@
+libkms.so.1 libkms1 #MINVER#
+ intel_cre...@base 2.4.20
+ kms_bo_cre...@base 2.4.20
+ kms_bo_dest...@base 2.4.20
+ kms_bo_get_p...@base 2.4.20
+ kms_bo_...@base 2.4.20
+ kms_bo_un...@base 2.4.20
+ kms_cre...@base 2.4.20
+ kms_dest...@base 2.4.20
+ kms_get_p...@base 2.4.20
+ linux_cre...@base 2.4.20
+ nouveau_cre...@base 2.4.20
+ vmwgfx_cre...@base 2.4.20
diff --git a/debian/patches/02_build_libkms_against_in_tree_drm.diff
b/debian/patches/02_build_libkms_against_in_tree_drm.diff
new file mode 100644
index 0000000..a80d734
--- /dev/null
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -0,0 +1,25 @@
+Description: Build libkms against in-tree xf86drm.h header
+ libkms requires xf86drm.h, and uses symbols from libdrm. Add
+ an appropriate search path to CFLAGS, and libdrm to LIBADD.
+Author: Christopher Halse Rogers <christopher.halse.rog...@canonical.com>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=26852
+
+Index: libdrm/libkms/Makefile.am
+===================================================================
+--- libdrm.orig/libkms/Makefile.am 2010-05-26 16:35:15.092706440 +1000
++++ libdrm/libkms/Makefile.am 2010-05-26 16:42:41.722739824 +1000
+@@ -1,11 +1,12 @@
+ AM_CFLAGS = \
+ $(WARN_CFLAGS) \
+- -I$(top_srcdir)/include/drm
++ -I$(top_srcdir)/include/drm \
++ -I$(top_srcdir)
+
+ libkms_la_LTLIBRARIES = libkms.la
+ libkms_ladir = $(libdir)
+ libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libkms_la_LIBADD =
++libkms_la_LIBADD = ../libdrm.la
+
+ #if HAVE_LIBUDEV
+ #libkms_la_LIBADD += $(LIBUDEV_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 8ca2297..e23f0b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01_default_perms.diff
+02_build_libkms_against_in_tree_drm.diff
diff --git a/debian/rules b/debian/rules
index 35f2400..4be7e37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ 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)
-confflags += --disable-libkms
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -25,12 +24,15 @@ else
endif
ifeq (linux, $(DEB_HOST_ARCH_OS))
confflags += --enable-udev
+ confflags += --enable-libkms
+ confflags += --enable-vmwgfx-experimental-api
confflags += --enable-nouveau-experimental-api
NOUVEAU = yes
confflags += --enable-radeon
RADEON = yes
else
confflags += --disable-udev
+ confflags += --disable-libkms
confflags += --disable-nouveau-experimental-api
NOUVEAU = no
confflags += --disable-radeon
@@ -132,6 +134,7 @@ endif
ifeq ($(RADEON), yes)
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
endif
+ dh_strip -p libkms1 --dbg-package=libkms1-dbg
dh_strip -s --remaining-packages
dh_compress -s
dh_fixperms -s
@@ -145,6 +148,7 @@ endif
ifeq ($(RADEON), yes)
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.20)' -- -c4
endif
+ dh_makeshlibs -plibkms1 -V'libkms1 (>=2.4.20)' -- -c4
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ohb5e-0001jo...@alioth.debian.org
