From 584595fab3592502a684200154e545a22483cee8 Mon Sep 17 00:00:00 2001
From: Jeff Morriss <jeff.morriss@ulticom.com>
Date: Thu, 3 Jun 2010 02:05:52 +0000
Subject: From Peter Harris via
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :

Mesa moved its API description file again.

Also, while I'm here, I noticed that they stopped using signed tags, so add
--tags to "git describe" for a better description of the mesa version used to
build the X11 dissector.

svn path=/trunk/; revision=33067
---
 tools/process-x11-xcb.pl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/process-x11-xcb.pl b/tools/process-x11-xcb.pl
index 9a370d613d..9692e34394 100755
--- a/tools/process-x11-xcb.pl
+++ b/tools/process-x11-xcb.pl
@@ -146,12 +146,11 @@ my $error;
 # glRender sub-op output files
 my $enum;
 
-
-my $mesadir = 'mesa/src/mesa/glapi';
-if (-d 'mesa/src/mesa/glapi/gen') {
-    # Mesa API definitions moved recently (February 22, 2010)
-    $mesadir = 'mesa/src/mesa/glapi/gen';
-}
+# Mesa API definitions keep moving
+my @mesas = ('mesa/src/mapi/glapi/gen',  # 2010-04-26
+	     'mesa/src/mesa/glapi/gen',  # 2010-02-22
+	     'mesa/src/mesa/glapi');     # 2004-05-18
+my $mesadir = (grep { -d } @mesas)[0];
 
 sub mesa_category_start {
     my ($t, $elt) = @_;
@@ -1284,7 +1283,7 @@ sub find_version {
     # this will generate an error on stderr if git isn't in our $PATH
     # but that's OK.  The version is still set to 'unknown' in that case
     # and at least the operator could see it.
-    my $ver = `git --git-dir=$lib/.git describe`;
+    my $ver = `git --git-dir=$lib/.git describe --tags`;
     $ver //= 'unknown';
     chomp $ver;
     return $ver;
-- 
cgit v1.2.3