diff options
| author | Eric Anholt <eric@anholt.net> | 2006-08-10 13:49:43 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-08-10 13:49:43 -0700 |
| commit | 975e60261088dee124b329d28c64e508bce1f90b (patch) | |
| tree | 798dd479dc0979311aa9aef18900f30235cd752b | |
| parent | 820e9a22fdb759cbdaac4a488322825bc0908b0d (diff) | |
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.
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/i810.h | 4 | ||||
| -rw-r--r-- | src/i810_dri.h | 4 | ||||
| -rw-r--r-- | src/i810_driver.c | 2 | ||||
| -rw-r--r-- | src/i830_dri.h | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 74e676ba..edd5d7b7 100644 --- a/configure.ac +++ b/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(.) @@ -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 diff --git a/src/i810_dri.h b/src/i810_dri.h index 408a4ebb..027a47a9 100644 --- a/src/i810_dri.h +++ b/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; diff --git a/src/i810_driver.c b/src/i810_driver.c index 65136bfa..3481d0b7 100644 --- a/src/i810_driver.c +++ b/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, diff --git a/src/i830_dri.h b/src/i830_dri.h index 44be353d..41f8a90a 100644 --- a/src/i830_dri.h +++ b/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 |