[Mesa-dev] [PATCH 01/18] mesa: Replace MESA_VERSION with PACKAGE_VERSION.
Andreas Boll
andreas.boll.dev at gmail.com
Thu Mar 14 08:20:58 PDT 2013
I was wondering if it was intented to change the version string in glxinfo
from
OpenGL version string: 3.0 Mesa 9.2-devel (git-42c1b33)
to
OpenGL version string: 3.0 Mesa 9.2.0 (git-439c3d4)
If someone builds from a 9.2 devel tarball instead from git
then there would be no difference in the version string to the 9.2.0
final release
since there is no git hash on tarball builds.
Andreas.
2013/3/11 Matt Turner <mattst88 at gmail.com>:
> One fewer place to have to update.
> ---
> 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 8390bda..33ff03d 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 d99aed8..e19a6a9 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 e5e80b8..94ec5b5 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 85c1732..3ae096c 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 b68a732..e3c3d09 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 7b35f3a..ad0e98d 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 2208d5e..1909b08 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 cdcf7ad..b428d40 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 97f1b8a..0635216 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 c903189..3d4af59 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 a3a6771..0b025d9 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 |
> --
> 1.7.8.6
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list