libdrm: Changes to 'debian-unstable'
debian/changelog | 7 +++
debian/control | 62 +++++++++++++++++++++++++++
debian/libdrm-exynos1.symbols | 20 ++++++++
debian/libdrm-freedreno1.install | 1
debian/libdrm-freedreno1.lintian-overrides | 1
debian/libdrm-freedreno1.symbols | 40 +++++++++++++++++
debian/patches/03_fix_exynos_test_ftbfs.diff | 23 ++++++++++
debian/patches/series | 1
debian/rules | 18 +++++--
9 files changed, 168 insertions(+), 5 deletions(-)
New commits:
commit 2ad898100e88fff8076133b5c791a364b4bc29e0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Jul 25 11:43:50 2014 +0200
Add a patch to fix FTBFS with exynos.
diff --git a/debian/changelog b/debian/changelog
index abd3ac1..eac5e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libdrm (2.4.54-2) UNRELEASED; urgency=medium
* Enable building freedreno and exynos on arm. (Closes: #741509)
+ * Add a patch to fix FTBFS with exynos.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Fri, 25 Jul 2014 10:24:34 +0200
diff --git a/debian/patches/03_fix_exynos_test_ftbfs.diff b/debian/patches/03_fix_exynos_test_ftbfs.diff
new file mode 100644
index 0000000..b94545e
--- /dev/null
+++ b/debian/patches/03_fix_exynos_test_ftbfs.diff
@@ -0,0 +1,23 @@
+commit a328b02c1d0b2e19e3587221aa290f05e33baefe
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Fri Jul 25 11:22:24 2014 +0200
+
+ exynos: do not build fimg2d_test when building without libkms support.
+
+ This prevents a build failure.
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+
+--- a/tests/exynos/Makefile.am
++++ b/tests/exynos/Makefile.am
+@@ -4,8 +4,10 @@
+ -I $(top_srcdir)/exynos \
+ -I $(top_srcdir)
+
++if HAVE_LIBKMS
+ noinst_PROGRAMS = \
+ exynos_fimg2d_test
++endif
+
+ exynos_fimg2d_test_LDADD = \
+ $(top_builddir)/libdrm.la \
diff --git a/debian/patches/series b/debian/patches/series
index d2f7405..cc77303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_default_perms.diff
02_fix_qxl_drm_h.diff
+03_fix_exynos_test_ftbfs.diff
commit 99f0810d7b83a1a7eb07a1dfe61dd130a3e572f0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Jul 25 11:16:43 2014 +0200
build exynos on arm too
diff --git a/debian/changelog b/debian/changelog
index f7c19e7..abd3ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
libdrm (2.4.54-2) UNRELEASED; urgency=medium
- * Enable building freedreno on arm. (Closes: #741509)
+ * Enable building freedreno and exynos on arm. (Closes: #741509)
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Fri, 25 Jul 2014 10:24:34 +0200
diff --git a/debian/control b/debian/control
index 476be5a..5b99f21 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends:
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-omap1 (= ${binary:Version}) [any-arm],
libdrm-freedreno1 (= ${binary:Version}) [any-arm],
+ libdrm-exynos1 (= ${binary:Version}) [any-arm],
${misc:Depends},
Multi-Arch: same
Replaces:
@@ -233,3 +234,33 @@ Description: Userspace interface to omap-specific kernel DRM services -- debuggi
Linux to provide hardware-accelerated OpenGL drivers.
.
This package provides the debugging symbols for the libdrm-freedreno1 package.
+
+Package: libdrm-exynos1
+Section: libs
+Architecture: any-arm
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- runtime
+ This library implements the userspace interface to the omap-specific kernel
+ DRM services. DRM stands for "Direct Rendering Manager", which is the
+ kernelspace portion of the "Direct Rendering Infrastructure" (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-exynos1-dbg
+Section: debug
+Priority: extra
+Architecture: any-arm
+Depends:
+ libdrm-exynos1 (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: Userspace interface to omap-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
+ of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-exynos1 package.
diff --git a/debian/libdrm-exynos1.symbols b/debian/libdrm-exynos1.symbols
new file mode 100644
index 0000000..445f2b4
--- /dev/null
+++ b/debian/libdrm-exynos1.symbols
@@ -0,0 +1,20 @@
+libdrm_exynos.so.1 libdrm-exynos1 #MINVER#
+ exynos_bo_create@Base 0
+ exynos_bo_destroy@Base 0
+ exynos_bo_from_name@Base 0
+ exynos_bo_get_info@Base 0
+ exynos_bo_get_name@Base 0
+ exynos_bo_handle@Base 0
+ exynos_bo_map@Base 0
+ exynos_device_create@Base 0
+ exynos_device_destroy@Base 0
+ exynos_prime_fd_to_handle@Base 0
+ exynos_prime_handle_to_fd@Base 0
+ exynos_vidi_connection@Base 0
+ g2d_blend@Base 0
+ g2d_copy@Base 0
+ g2d_copy_with_scale@Base 0
+ g2d_exec@Base 0
+ g2d_fini@Base 0
+ g2d_init@Base 0
+ g2d_solid_fill@Base 0
diff --git a/debian/rules b/debian/rules
index ed4e543..4bcfc4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,11 @@ endif
ifeq ($(ARM), yes)
confflags += --enable-omap-experimental-api
confflags += --enable-freedreno-experimental-api
+ confflags += --enable-exynos-experimental-api
else
confflags += --disable-omap-experimental-api
confflags += --disable-freedreno-experimental-api
+ confflags += --disable-exynos-experimental-api
endif
###
@@ -81,6 +83,7 @@ endif
ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
+ dh_strip -plibdrm-exynos1 --dbg-package=libdrm-exynos1-dbg
endif
dh_strip -s --remaining-packages
@@ -96,6 +99,7 @@ endif
ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1' -- -c4
+ dh_makeshlibs -plibdrm-exynos1 -V'libdrm-exynos1' -- -c4
endif
%:
commit e0ecbaa110adda9805f55482f67544d755720161
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Fri Jul 25 11:13:00 2014 +0200
Enable building freedreno on arm. (Closes: #741509)
diff --git a/debian/changelog b/debian/changelog
index c06edd6..f7c19e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.54-2) UNRELEASED; urgency=medium
+
+ * Enable building freedreno on arm. (Closes: #741509)
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Fri, 25 Jul 2014 10:24:34 +0200
+
libdrm (2.4.54-1) unstable; urgency=medium
[ Andreas Boll ]
diff --git a/debian/control b/debian/control
index 0bd1bae..476be5a 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,7 @@ Depends:
libdrm-radeon1 (= ${binary:Version}),
libdrm-nouveau2 (= ${binary:Version}) [linux-any],
libdrm-omap1 (= ${binary:Version}) [any-arm],
+ libdrm-freedreno1 (= ${binary:Version}) [any-arm],
${misc:Depends},
Multi-Arch: same
Replaces:
@@ -202,3 +203,33 @@ Description: Userspace interface to omap-specific kernel DRM services -- debuggi
Linux to provide hardware-accelerated OpenGL drivers.
.
This package provides the debugging symbols for the libdrm-omap1 package.
+
+Package: libdrm-freedreno1
+Section: libs
+Architecture: any-arm
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Userspace interface to omap-specific kernel DRM services -- runtime
+ This library implements the userspace interface to the omap-specific kernel
+ DRM services. DRM stands for "Direct Rendering Manager", which is the
+ kernelspace portion of the "Direct Rendering Infrastructure" (DRI). The DRI is
+ currently used on Linux to provide hardware-accelerated OpenGL drivers.
+
+Package: libdrm-freedreno1-dbg
+Section: debug
+Priority: extra
+Architecture: any-arm
+Depends:
+ libdrm-freedreno1 (= ${binary:Version}),
+ ${misc:Depends},
+Multi-Arch: same
+Description: Userspace interface to omap-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
+ of the "Direct Rendering Infrastructure" (DRI). The DRI is currently used on
+ Linux to provide hardware-accelerated OpenGL drivers.
+ .
+ This package provides the debugging symbols for the libdrm-freedreno1 package.
diff --git a/debian/libdrm-freedreno1.install b/debian/libdrm-freedreno1.install
new file mode 100644
index 0000000..23b9ad6
--- /dev/null
+++ b/debian/libdrm-freedreno1.install
@@ -0,0 +1 @@
+usr/lib/*/libdrm_freedreno.so.1*
diff --git a/debian/libdrm-freedreno1.lintian-overrides b/debian/libdrm-freedreno1.lintian-overrides
new file mode 100644
index 0000000..2efb4e6
--- /dev/null
+++ b/debian/libdrm-freedreno1.lintian-overrides
@@ -0,0 +1 @@
+libdrm-freedreno1: symbols-declares-dependency-on-other-package libdrm-freedreno-private
diff --git a/debian/libdrm-freedreno1.symbols b/debian/libdrm-freedreno1.symbols
new file mode 100644
index 0000000..751d8e4
--- /dev/null
+++ b/debian/libdrm-freedreno1.symbols
@@ -0,0 +1,40 @@
+libdrm_freedreno.so.1 libdrm-freedreno1 #MINVER#
+| libdrm-freedreno-private
+ is_kgsl_pipe@Base 0 1
+ (regex)"^msm_.*@Base" 0 1
+ (regex)"^kgsl_.*@Base" 0 1
+ fd_bo_cpu_fini@Base 0
+ fd_bo_cpu_prep@Base 0
+ fd_bo_del@Base 0
+ fd_bo_from_fbdev@Base 0
+ fd_bo_from_handle@Base 0
+ fd_bo_from_name@Base 0
+ fd_bo_get_name@Base 0
+ fd_bo_handle@Base 0
+ fd_bo_map@Base 0
+ fd_bo_new@Base 0
+ fd_bo_ref@Base 0
+ fd_bo_size@Base 0
+ fd_cleanup_bo_cache@Base 0
+ fd_device_del@Base 0
+ fd_device_del_locked@Base 0
+ fd_device_new@Base 0
+ fd_device_new_dup@Base 0
+ fd_device_ref@Base 0
+ fd_pipe_del@Base 0
+ fd_pipe_get_param@Base 0
+ fd_pipe_new@Base 0
+ fd_pipe_wait@Base 0
+ fd_ringbuffer_del@Base 0
+ fd_ringbuffer_emit_reloc_ring@Base 0
+ fd_ringbuffer_flush@Base 0
+ fd_ringbuffer_new@Base 0
+ fd_ringbuffer_reloc@Base 0
+ fd_ringbuffer_reset@Base 0
+ fd_ringbuffer_set_parent@Base 0
+ fd_ringbuffer_timestamp@Base 0
+ fd_ringmarker_del@Base 0
+ fd_ringmarker_dwords@Base 0
+ fd_ringmarker_flush@Base 0
+ fd_ringmarker_mark@Base 0
+ fd_ringmarker_new@Base 0
diff --git a/debian/rules b/debian/rules
index 3041981..ed4e543 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,14 +40,16 @@ else
confflags += --disable-intel
endif
-# Omap is only on arm
+# Omap and freedreno are only on arm
ifneq (,$(filter arm,$(DEB_HOST_ARCH_CPU)))
- OMAP = yes
+ ARM = yes
endif
-ifeq ($(OMAP), yes)
+ifeq ($(ARM), yes)
confflags += --enable-omap-experimental-api
+ confflags += --enable-freedreno-experimental-api
else
confflags += --disable-omap-experimental-api
+ confflags += --disable-freedreno-experimental-api
endif
###
@@ -76,8 +78,9 @@ ifeq ($(NOUVEAU), yes)
dh_strip -plibdrm-nouveau2 --dbg-package=libdrm-nouveau2-dbg
endif
dh_strip -plibdrm-radeon1 --dbg-package=libdrm-radeon1-dbg
-ifeq ($(OMAP), yes)
+ifeq ($(ARM), yes)
dh_strip -plibdrm-omap1 --dbg-package=libdrm-omap1-dbg
+ dh_strip -plibdrm-freedreno1 --dbg-package=libdrm-freedreno1-dbg
endif
dh_strip -s --remaining-packages
@@ -90,8 +93,9 @@ ifeq ($(NOUVEAU), yes)
dh_makeshlibs -plibdrm-nouveau2 -V'libdrm-nouveau2 (>= 2.4.38)' -- -c4
endif
dh_makeshlibs -plibdrm-radeon1 -V'libdrm-radeon1 (>= 2.4.39)' -- -c4
-ifeq ($(OMAP), yes)
+ifeq ($(ARM), yes)
dh_makeshlibs -plibdrm-omap1 -V'libdrm-omap1 (>= 2.4.38)' -- -c4
+ dh_makeshlibs -plibdrm-freedreno1 -V'libdrm-freedreno1' -- -c4
endif
%:
Reply to: