debian/changelog | 5 ++++
debian/patches/02_build_libkms_against_in_tree_drm.diff | 19 ++++++++++++++++
debian/patches/series | 1
3 files changed, 25 insertions(+)
New commits:
commit 12dedbc4491331de9f13e66aa10328560f28f2f0
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Thu Jun 10 16:37:51 2010 -0400
Add 02_build_libkms_against_in_tree_drm.diff back, refresh it with just the
needed hunk.
diff --git a/debian/changelog b/debian/changelog
index ee8066e..1ef2372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,14 @@ libdrm (2.4.21-1) UNRELEASED; urgency=low
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.
[ Robert Hooker ]
* New upstream release.
+ * Refresh 02_build_libkms_against_in_tree_drm.
+ * Update libdrm-intel1.symbols, libdrm-radeon1.symbols and shlibs.
-- Robert Hooker <sarv...@ubuntu.com> Thu, 10 Jun 2010 14:44:36 -0400
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..7cbde37
--- /dev/null
+++ b/debian/patches/02_build_libkms_against_in_tree_drm.diff
@@ -0,0 +1,19 @@
+Description: Build libkms against in-tree xf86drm.h header
+ libkms requires xf86drm.h, and uses symbols from libdrm. Add
+ 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
++++ libdrm/libkms/Makefile.am
+@@ -6,7 +6,7 @@ AM_CFLAGS = \
+ 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
--
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/e1omow1-0006ki...@alioth.debian.org
