Bug #7829: Fix reported driver version.

The driver now reports itself as the PACKAGE_VERSION from autoconf.  The DRI
DDX -> client interface version is dissociated from this so that we can do
appropriate major/minor versioning of the interface that's not tied to the
package version.  Bumped the i830 ddx dri version patchlevel to note the
fix in the previous commit.

configure.ac

@@ -26,6 +26,16 @@ AC_INIT([xf86-video-i810],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-i810)
 
+AC_DEFINE_UNQUOTED([INTEL_VERSION_MAJOR],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
+		   [Major version])
+AC_DEFINE_UNQUOTED([INTEL_VERSION_MINOR],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')],
+		   [Minor version])
+AC_DEFINE_UNQUOTED([INTEL_VERSION_PATCH],
+		   [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')],
+		   [Patch version])
+
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)

src/i810.h

@@ -64,10 +64,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define I810_VERSION 4000
 #define I810_NAME "I810"
 #define I810_DRIVER_NAME "i810"
-#define I810_MAJOR_VERSION 1
-#define I810_MINOR_VERSION 6
-#define I810_PATCHLEVEL 3
-
 
 /* HWMC Surfaces */
 #define I810_MAX_SURFACES 7

src/i810_dri.h

@@ -8,6 +8,10 @@
 
 #define I810_MAX_DRAWABLES 256
 
+#define I810_MAJOR_VERSION 1
+#define I810_MINOR_VERSION 6
+#define I810_PATCHLEVEL 3
+
 typedef struct {
    drm_handle_t regs;
    drmSize regsSize;

src/i810_driver.c

@@ -379,7 +379,7 @@ static XF86ModuleVersionInfo i810VersRec = {
    MODINFOSTRING1,
    MODINFOSTRING2,
    XORG_VERSION_CURRENT,
-   I810_MAJOR_VERSION, I810_MINOR_VERSION, I810_PATCHLEVEL,
+   INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
    ABI_CLASS_VIDEODRV,
    ABI_VIDEODRV_VERSION,
    MOD_CLASS_VIDEODRV,

src/i830_dri.h

@@ -10,7 +10,7 @@
 
 #define I830_MAJOR_VERSION 1
 #define I830_MINOR_VERSION 6
-#define I830_PATCHLEVEL 2
+#define I830_PATCHLEVEL 4
 
 #define I830_REG_SIZE 0x80000