xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
glx/glxdricommon.c | 24 ++++++++++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 1c3bc9b0de7059b54592ed0b7497ae3cf3fe5eb9
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Nov 25 14:53:02 2013 +0100
release to unstable
diff --git a/debian/changelog b/debian/changelog
index ab35c44..eb503f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.14.3-5) UNRELEASED; urgency=low
+xorg-server (2:1.14.3-5) unstable; urgency=low
* Cherry-pick a upstream commit to fix mesa-10 driver loading.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 25 Nov 2013 12:30:11 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 25 Nov 2013 14:52:54 +0100
xorg-server (2:1.14.3-4) unstable; urgency=high
commit 3ac959c25cb50a11d9249c5afedfec1c99cc4d91
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Nov 25 14:52:48 2013 +0100
Cherry-pick a upstream commit to fix mesa-10 driver loading.
diff --git a/debian/changelog b/debian/changelog
index 7492008..ab35c44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.3-5) UNRELEASED; urgency=low
+
+ * Cherry-pick a upstream commit to fix mesa-10 driver loading.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 25 Nov 2013 12:30:11 +0100
+
xorg-server (2:1.14.3-4) unstable; urgency=high
[ Timo Aaltonen ]
commit f91d0780f402caeed1f7a391dab2d5a98f3a545f
Author: Eric Anholt <eric@anholt.net>
Date: Tue Oct 22 14:22:04 2013 -0700
glx: Add support for the new DRI loader entrypoint.
This is going to be exposed (and not the old entrypoint) for some DRI
drivers once the megadrivers series lands, and the plan is to
eventually transition all drivers to that. Hopefully this is
unobtrusive enough to merge to stable X servers so that they can be
compatible with new Mesa versions.
v2: typo fix in the comment
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893)
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index c90f380..5686c5f 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -209,6 +209,14 @@ glxConvertConfigs(const __DRIcoreExtension * core,
static const char dri_driver_path[] = DRI_DRIVER_PATH;
+/* Temporary define to allow building without a dri_interface.h from
+ * updated Mesa. Some day when we don't care about Mesa that old any
+ * more this can be removed.
+ */
+#ifndef __DRI_DRIVER_GET_EXTENSIONS
+#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions"
+#endif
+
void *
glxProbeDriver(const char *driverName,
void **coreExt, const char *coreName, int coreVersion,
@@ -217,7 +225,8 @@ glxProbeDriver(const char *driverName,
int i;
void *driver;
char filename[PATH_MAX];
- const __DRIextension **extensions;
+ char *get_extensions_name;
+ const __DRIextension **extensions = NULL;
snprintf(filename, sizeof filename, "%s/%s_dri.so",
dri_driver_path, driverName);
@@ -229,7 +238,18 @@ glxProbeDriver(const char *driverName,
goto cleanup_failure;
}
- extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
+ if (asprintf(&get_extensions_name, "%s_%s",
+ __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) {
+ const __DRIextension **(*get_extensions)(void);
+
+ get_extensions = dlsym(driver, get_extensions_name);
+ if (get_extensions)
+ extensions = get_extensions();
+ free(get_extensions_name);
+ }
+
+ if (!extensions)
+ extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
if (extensions == NULL) {
LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
driverName, dlerror());
Reply to: