From 439c3d4e313370823d49b53f031697cc8b18d171 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 9 Mar 2013 00:25:45 -0800 Subject: [PATCH] mesa: Replace MESA_VERSION with PACKAGE_VERSION. One fewer place to have to update. Reviewed-by: Eric Anholt --- src/gallium/state_trackers/clover/Makefile.am | 1 - src/gallium/state_trackers/clover/api/device.cpp | 4 ++-- src/gallium/state_trackers/clover/api/platform.cpp | 2 +- src/gallium/state_trackers/vega/Makefile.am | 3 +-- src/gallium/state_trackers/vega/SConscript | 2 +- src/gallium/state_trackers/vega/vg_manager.c | 2 +- src/mesa/drivers/x11/fakeglx.c | 2 +- src/mesa/main/context.c | 2 +- src/mesa/main/errors.c | 2 +- src/mesa/main/version.c | 2 +- src/mesa/state_tracker/st_manager.c | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am index 8390bda4aeb..33ff03d77ee 100644 --- a/src/gallium/state_trackers/clover/Makefile.am +++ b/src/gallium/state_trackers/clover/Makefile.am @@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = \ $(GALLIUM_PIPE_LOADER_DEFINES) \ - -DMESA_VERSION=\"$(MESA_VERSION)\" \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/gallium/include \ diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp index d99aed8f564..cf68d0fc18c 100644 --- a/src/gallium/state_trackers/clover/api/device.cpp +++ b/src/gallium/state_trackers/clover/api/device.cpp @@ -217,13 +217,13 @@ clGetDeviceInfo(cl_device_id dev, cl_device_info param, return string_property(buf, size, size_ret, dev->vendor_name()); case CL_DRIVER_VERSION: - return string_property(buf, size, size_ret, MESA_VERSION); + return string_property(buf, size, size_ret, PACKAGE_VERSION); case CL_DEVICE_PROFILE: return string_property(buf, size, size_ret, "FULL_PROFILE"); case CL_DEVICE_VERSION: - return string_property(buf, size, size_ret, "OpenCL 1.1 MESA " MESA_VERSION); + return string_property(buf, size, size_ret, "OpenCL 1.1 MESA " PACKAGE_VERSION); case CL_DEVICE_EXTENSIONS: return string_property(buf, size, size_ret, ""); diff --git a/src/gallium/state_trackers/clover/api/platform.cpp b/src/gallium/state_trackers/clover/api/platform.cpp index e5e80b85256..f99b6949356 100644 --- a/src/gallium/state_trackers/clover/api/platform.cpp +++ b/src/gallium/state_trackers/clover/api/platform.cpp @@ -51,7 +51,7 @@ clGetPlatformInfo(cl_platform_id platform, cl_platform_info param_name, case CL_PLATFORM_VERSION: return string_property(buf, size, size_ret, - "OpenCL 1.1 MESA " MESA_VERSION); + "OpenCL 1.1 MESA " PACKAGE_VERSION); case CL_PLATFORM_NAME: return string_property(buf, size, size_ret, "Default"); diff --git a/src/gallium/state_trackers/vega/Makefile.am b/src/gallium/state_trackers/vega/Makefile.am index 85c173212c4..3ae096c85f3 100644 --- a/src/gallium/state_trackers/vega/Makefile.am +++ b/src/gallium/state_trackers/vega/Makefile.am @@ -25,8 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = $(GALLIUM_CFLAGS) AM_CPPFLAGS = \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/src/mapi \ - -DVEGA_VERSION_STRING=\"$(MESA_VERSION)\" + -I$(top_srcdir)/src/mapi noinst_LTLIBRARIES = libvega.la diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript index b68a73299a1..e3c3d093ea0 100644 --- a/src/gallium/state_trackers/vega/SConscript +++ b/src/gallium/state_trackers/vega/SConscript @@ -12,7 +12,7 @@ env.Append(CPPPATH = [ Dir('.'), ]) env.Append(CPPDEFINES = [ - 'VEGA_VERSION_STRING=', + 'PACKAGE_VERSION=' 'KHRONOS_DLL_EXPORTS', ]) diff --git a/src/gallium/state_trackers/vega/vg_manager.c b/src/gallium/state_trackers/vega/vg_manager.c index 7b35f3afeeb..ad0e98d3a62 100644 --- a/src/gallium/state_trackers/vega/vg_manager.c +++ b/src/gallium/state_trackers/vega/vg_manager.c @@ -370,7 +370,7 @@ vg_api_destroy(struct st_api *stapi) } static const struct st_api vg_api = { - "Vega " VEGA_VERSION_STRING, + "Vega " PACKAGE_VERSION, ST_API_OPENVG, ST_PROFILE_DEFAULT_MASK, 0, diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index 2208d5e7f77..1909b08d5e7 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -63,7 +63,7 @@ #define SERVER_MINOR_VERSION 4 /* This is appended onto the glXGetClient/ServerString version strings. */ -#define MESA_GLX_VERSION "Mesa " MESA_VERSION_STRING +#define MESA_GLX_VERSION "Mesa " PACKAGE_VERSION /* Who implemented this GLX? */ #define VENDOR "Brian Paul" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index cdcf7adfa25..b428d40fc1c 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -410,7 +410,7 @@ one_time_init( struct gl_context *ctx ) #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__) if (MESA_VERBOSE != 0) { _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n", - MESA_VERSION_STRING, __DATE__, __TIME__); + PACKAGE_VERSION, __DATE__, __TIME__); } #endif diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c index 684f235c32a..1c1d85d414d 100644 --- a/src/mesa/main/errors.c +++ b/src/mesa/main/errors.c @@ -848,7 +848,7 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) _mesa_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args ); va_end( args ); fprintf(stderr, "Mesa %s implementation error: %s\n", - MESA_VERSION_STRING, str); + PACKAGE_VERSION, str); fprintf(stderr, "Please report at bugs.freedesktop.org\n"); } } diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index c9031898129..3d4af5923c6 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -99,7 +99,7 @@ create_version_string(struct gl_context *ctx, const char *prefix) ctx->VersionString = malloc(max); if (ctx->VersionString) { _mesa_snprintf(ctx->VersionString, max, - "%s%u.%u%s Mesa " MESA_VERSION_STRING + "%s%u.%u%s Mesa " PACKAGE_VERSION #ifdef MESA_GIT_SHA1 " (" MESA_GIT_SHA1 ")" #endif diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index a3a67712a2f..0b025d9d508 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -883,7 +883,7 @@ st_manager_add_color_renderbuffer(struct st_context *st, } static const struct st_api st_gl_api = { - "Mesa " MESA_VERSION_STRING, + "Mesa " PACKAGE_VERSION, ST_API_OPENGL, #if FEATURE_GL ST_PROFILE_DEFAULT_MASK | -- 2.30.2