mesa: Changes to 'ubuntu'
debian/changelog | 33 +++++++++++++++++++++++++--------
debian/libxatracker2.symbols | 10 +++++-----
debian/rules | 6 +++---
3 files changed, 33 insertions(+), 16 deletions(-)
New commits:
commit 6c1fc18ed16cbbf7ec84bdf601b1698b4285be50
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Dec 9 19:20:40 2013 +0100
Do not require libdrm-intel on arm, fixes FTBFS regression.
diff --git a/debian/changelog b/debian/changelog
index b6a61bb..f82a9cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.0.0-1ubuntu2) trusty; urgency=low
+
+ * Do not require libdrm-intel on arm, fixes FTBFS regression.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 19:20:07 +0100
+
mesa (10.0.0-1ubuntu1) trusty; urgency=low
* Merge from released debian-experimental, changes:
diff --git a/debian/rules b/debian/rules
index 08b3b7e..1736a07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,6 +82,7 @@ else
# Radeonsi needs LLVM, so only build it on the subset of archs
# where we have LLVM enabled.
GALLIUM_DRIVERS += radeonsi
+ DRI_DRIVERS += i915 i965
else
EXTRA_SED="-e/libllvmradeon/ s/^/\#/"
endif
@@ -93,7 +94,6 @@ else
DRI_DRIVERS += swrast
else
GALLIUM_DRIVERS += swrast
- DRI_DRIVERS += i915 i965
endif
# LLVM is required for r300g and recommended for swrastg on x86:
commit d9f357520940b72c0dd43b7e71e141953fa210c3
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Dec 9 12:00:45 2013 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 7ce3ffd..b6a61bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-mesa (10.0.0-1ubuntu1) UNRELEASED; urgency=low
+mesa (10.0.0-1ubuntu1) trusty; urgency=low
* Merge from released debian-experimental, changes:
- Reset versions on libxatracker2 symbols.
- Enable llvmpipe on armhf.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 11:55:04 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 11:59:03 +0100
mesa (10.0.0-1) experimental; urgency=low
commit 9b82bcf55038997c1231f1d6c25928e24bb0eb37
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Dec 9 11:58:52 2013 +0100
annotate changelog
diff --git a/debian/changelog b/debian/changelog
index e205ed5..7ce3ffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-mesa (10.0.0-0ubuntu1) trusty; urgency=low
+mesa (10.0.0-1ubuntu1) UNRELEASED; urgency=low
- * Merge from unreleased debian-experimental.
- * Drop upstreamed aarch64 patch.
- * Refresh patches.
- * Disable 118-dricore-gallium.patch for now, requires porting.
+ * Merge from released debian-experimental, changes:
+ - Reset versions on libxatracker2 symbols.
+ - Enable llvmpipe on armhf.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 11:11:41 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 11:55:04 +0100
mesa (10.0.0-1) experimental; urgency=low
@@ -27,6 +26,15 @@ mesa (10.0.0-1) experimental; urgency=low
-- Julien Cristau <jcristau@debian.org> Sun, 08 Dec 2013 15:17:17 +0100
+mesa (10.0.0-0ubuntu1) trusty; urgency=low
+
+ * Merge from unreleased debian-experimental.
+ * Drop upstreamed aarch64 patch.
+ * Refresh patches.
+ * Disable 118-dricore-gallium.patch for now, requires porting.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 09 Dec 2013 11:11:41 +0100
+
mesa (9.2.2-1ubuntu2) trusty; urgency=medium
* Build without Mir backend on ppc64.
commit acfa63a7eb2d63a184d335fc47f502834c2aecfe
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 8 15:44:45 2013 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index 817388f..1046d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.0.0-1) UNRELEASED; urgency=low
+mesa (10.0.0-1) experimental; urgency=low
[ Emilio Pozuelo Monfort ]
* debian/control:
@@ -16,7 +16,7 @@ mesa (10.0.0-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* rules: Enable llvmpipe on armhf, should work now.
- -- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 27 Oct 2013 20:49:30 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 08 Dec 2013 15:17:17 +0100
mesa (9.2.2-1) unstable; urgency=low
commit 07241d21dff73df3135f2bf4a5f0a592b52999c4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 8 12:08:30 2013 +0100
Unversion symbols in libxatracker2.symbols
New SONAME → new package → no need to track old versions.
diff --git a/debian/libxatracker2.symbols b/debian/libxatracker2.symbols
index bebe01e..c362a39 100644
--- a/debian/libxatracker2.symbols
+++ b/debian/libxatracker2.symbols
@@ -1,5 +1,5 @@
libxatracker.so.2 libxatracker2 #MINVER#
- driver_descriptor@Base 9.1~
+ driver_descriptor@Base 0
xa_composite_allocation@Base 0
xa_composite_check_accelerated@Base 0
xa_composite_done@Base 0
@@ -8,7 +8,7 @@ libxatracker.so.2 libxatracker2 #MINVER#
xa_context_create@Base 0
xa_context_default@Base 0
xa_context_destroy@Base 0
- xa_context_flush@Base 10.0
+ xa_context_flush@Base 0
xa_copy@Base 0
xa_copy_done@Base 0
xa_copy_prepare@Base 0
@@ -22,13 +22,13 @@ libxatracker.so.2 libxatracker2 #MINVER#
xa_surface_create@Base 0
xa_surface_dma@Base 0
xa_surface_format@Base 0
- xa_surface_from_handle@Base 10.0
+ xa_surface_from_handle@Base 0
xa_surface_handle@Base 0
xa_surface_map@Base 0
xa_surface_redefine@Base 0
- xa_surface_ref@Base 10.0
+ xa_surface_ref@Base 0
xa_surface_unmap@Base 0
- xa_surface_unref@Base 10.0
+ xa_surface_unref@Base 0
xa_tracker_create@Base 0
xa_tracker_destroy@Base 0
xa_tracker_version@Base 0
commit fd527792a0663b444906e43585c1c3af310c3dfa
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sun Dec 8 13:11:23 2013 +0200
rules: fix s/armhf/arm/ for llvmpipe
diff --git a/debian/rules b/debian/rules
index d82b620..74cdfc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,7 +84,7 @@ else
# Build the llvmpipe driver only on amd64, i386, and arm until it's tested elsewhere
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386 armhf))
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386 arm))
DRI_DRIVERS += swrast
else
GALLIUM_DRIVERS += swrast
commit 5667b9f6871a9a04acb7da05d305851ba32461aa
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Dec 6 07:28:54 2013 +0200
rules: Enable llvmpipe on armhf, should work now.
diff --git a/debian/changelog b/debian/changelog
index 844c274..817388f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ mesa (10.0.0-1) UNRELEASED; urgency=low
* Cherry pick commit to hide some gbm symbols.
* Manually install *_dri.so to preserve mega-driver hardlinks.
+ [ Timo Aaltonen ]
+ * rules: Enable llvmpipe on armhf, should work now.
+
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 27 Oct 2013 20:49:30 +0100
mesa (9.2.2-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index af5ae4e..d82b620 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,8 +83,8 @@ else
endif
-# Build the llvmpipe driver only on amd64, i386 until it's tested elsewhere
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
+# Build the llvmpipe driver only on amd64, i386, and arm until it's tested elsewhere
+ ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386 armhf))
DRI_DRIVERS += swrast
else
GALLIUM_DRIVERS += swrast
Reply to: