mesa: Changes to 'debian-experimental'
debian/changelog | 1
debian/patches/03_gbm_make_devices_static.diff | 27 -------------------------
debian/patches/series | 1
3 files changed, 1 insertion(+), 28 deletions(-)
New commits:
commit 281a696c849528d1478709f3b547aa36d6a0b5d4
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Apr 11 18:32:56 2014 +0300
03_gbm_make_devices_static.diff dropped, upstream
diff --git a/debian/changelog b/debian/changelog
index 613f751..cac4227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (10.2.0~git20140411-1) UNRELEASED; urgency=medium
* New upstream snapshot.
+ - 03_gbm_make_devices_static.diff dropped, upstream
-- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 11 Apr 2014 17:48:37 +0300
diff --git a/debian/patches/03_gbm_make_devices_static.diff b/debian/patches/03_gbm_make_devices_static.diff
deleted file mode 100644
index 3b3be9b..0000000
--- a/debian/patches/03_gbm_make_devices_static.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5956d0a70600fe3f70282419c3328e68e8b68f1a Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sun, 2 Mar 2014 17:44:29 +0100
-Subject: [PATCH] gbm: make 'devices' array static
-
-It's only used in this one file, and exporting a symbol named 'devices'
-from a shared library is terribly wrong.
----
- src/gbm/main/gbm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c
-index 72eeabf..04cd90c 100644
---- a/src/gbm/main/gbm.c
-+++ b/src/gbm/main/gbm.c
-@@ -43,7 +43,7 @@
-
- #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
-
--struct gbm_device *devices[16];
-+static struct gbm_device *devices[16];
-
- static int device_num = 0;
-
---
-1.9.0
-
diff --git a/debian/patches/series b/debian/patches/series
index bc8e424..0e02882 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
02_gbm_no_undefined.diff
-03_gbm_make_devices_static.diff
04_osmesa_version.diff
07_gallium-fix-build-failure-on-powerpcspe.diff
Reply to: