From 9b5c988b7b6acf0bd37302923c1ff968b9f456b0 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 16 Dec 2025 14:10:30 +0100 Subject: [PATCH] drop unnecessary git revision printing Signed-off-by: Enrico Weigelt, metux IT consult --- .gitignore | 1 - configure.ac | 27 --------------------------- meson.build | 3 --- src/sna/Makefile.am | 7 ------- src/sna/git_version.h.in | 1 - src/sna/meson.build | 8 +------- src/sna/sna_driver.c | 14 -------------- 7 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 src/sna/git_version.h.in diff --git a/.gitignore b/.gitignore index f7799e52..403cac27 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ stamp-h? symlink-tree texinfo.tex ylwrap -src/sna/git_version.h src/sna/brw/brw_test # Do not edit the following section diff --git a/configure.ac b/configure.ac index 7bd071fc..ab682cde 100644 --- a/configure.ac +++ b/configure.ac @@ -91,33 +91,6 @@ if test "x$backlight_helper" = "xyes"; then AC_DEFINE(USE_BACKLIGHT_HELPER, 1, [Enable use of the backlight helper interfaces]) fi -# Are we in a git checkout? -dot_git=no -if test -e .git; then - AC_DEFINE(HAVE_DOT_GIT, 1, [Are we in a git checkout?]) - dot_git=yes -fi -AM_CONDITIONAL(HAVE_DOT_GIT, test "x$dot_git" = "xyes") - -# If so, we include the git description in our logs for sanity checking. -# -# However, for people not running their own drivers this is just noise. -# So we copy the xserver's builderstring idiom to allow for this to be -# overridden and perhaps replaced with something more useful. -AC_ARG_WITH(builderstring, - AS_HELP_STRING([--with-builderstring=BUILDERSTRING], - [Additional builder string (default: use git describe)]), - [BUILDERSTRING="$withval"], - [BUILDERSTRING="x-magic-git-describe"]) - -if test "x$BUILDERSTRING" = "xx-magic-git-describe" -a "x$dot_git" = "xyes"; then - AC_DEFINE(USE_GIT_DESCRIBE, 1, [Use automagic builder description]) -else - if test "x$BUILDERSTRING" != x -a "x$BUILDERSTRING" != "xno" -a "x$BUILDERSTRING" != xx-magic-git-describe; then - AC_DEFINE_UNQUOTED(BUILDER_DESCRIPTION, ["$BUILDERSTRING"], [Builder description]) - fi -fi - AC_ARG_ENABLE(gen4asm, AS_HELP_STRING([--enable-gen4asm], [Enable rebuilding the gen4 assembly files [default=no]]), diff --git a/meson.build b/meson.build index 2ef3cb1a..9be57920 100644 --- a/meson.build +++ b/meson.build @@ -62,9 +62,6 @@ endif with_tools = get_option('tools') -config.set('USE_GIT_DESCRIBE', 1) -config.set('BUILDER_DESCRIPTION', 1) - atomic_primitives = 'none' atomic_primitives_code = ''' diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am index adf13963..86628c18 100644 --- a/src/sna/Makefile.am +++ b/src/sna/Makefile.am @@ -150,11 +150,4 @@ libsna_la_SOURCES += \ $(NULL) endif -if HAVE_DOT_GIT -git_version.h: $(top_srcdir)/.git/HEAD $(shell sed -e '/ref:/!d' -e 's#ref: *#$(top_srcdir)/.git/#' < $(top_srcdir)/.git/HEAD) - @echo "Recording git-tree used for compilation: `git describe`" - @V=`git describe`; echo "static const char git_version[] = \"$$V\";" > git_version.h -sna_driver.c: git_version.h -endif - AM_CFLAGS += @NOWARNFLAGS@ diff --git a/src/sna/git_version.h.in b/src/sna/git_version.h.in deleted file mode 100644 index dd8e5170..00000000 --- a/src/sna/git_version.h.in +++ /dev/null @@ -1 +0,0 @@ -static const char git_version[] = "@VCS_TAG@"; diff --git a/src/sna/meson.build b/src/sna/meson.build index e1eb25f2..08526039 100644 --- a/src/sna/meson.build +++ b/src/sna/meson.build @@ -5,12 +5,6 @@ if cc.has_member('struct sysinfo', 'totalram', config.set('HAVE_STRUCT_SYSINFO_TOTALRAM', 1) endif -git_version_h = vcs_tag(input : 'git_version.h.in', output : 'git_version.h', - fallback : 'not compiled from git', - command : [ 'git', 'describe' ] ) - -config.set('HAVE_DOT_GIT', 1) - if cc.has_header('alloca.h') config.set('HAVE_ALLOCA_H', 1) endif @@ -124,7 +118,7 @@ subdir('brw') subdir('fb') sna = static_library('sna', - [ git_version_h, sna_sources ], + [ sna_sources ], dependencies : sna_deps, link_with : [ brw, fb, ], include_directories : inc, diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 5056fa4f..6d80ffea 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -74,12 +74,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include #endif -#if HAVE_DOT_GIT -#include "git_version.h" -#else -#define git_version "not compiled from git" -#endif - #ifdef TEARFREE #define ENABLE_TEAR_FREE TRUE #else @@ -1399,13 +1393,6 @@ static void describe_kms(ScrnInfoPtr scrn) static void describe_sna(ScrnInfoPtr scrn) { -#if defined(USE_GIT_DESCRIBE) - xf86DrvMsg(scrn->scrnIndex, X_INFO, - "SNA compiled from %s\n", git_version); -#elif defined(BUILDER_DESCRIPTION) - xf86DrvMsg(scrn->scrnIndex, X_INFO, - "SNA compiled: %s\n", BUILDER_DESCRIPTION); -#endif #if HAS_DEBUG_FULL ErrorF("SNA compiled with full debug logging; expect to run slowly\n"); #endif @@ -1430,7 +1417,6 @@ static void describe_sna(ScrnInfoPtr scrn) "SNA compiled for use with valgrind\n"); VALGRIND_PRINTF("SNA compiled for use with valgrind\n"); #endif - DBG(("xf86-video-intel version: %s\n", git_version)); DBG(("pixman version: %s\n", pixman_version_string())); }