acinclude.m4 | 91 -------------------------------------------------------
configure.ac | 12 -------
src/via_driver.c | 14 ++++----
src/via_driver.h | 4 +-
4 files changed, 12 insertions(+), 109 deletions(-)
New commits:
commit d18a06b37f0b8c3dacd221d881ee9bc38df4496b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 27 19:25:34 2020 -0700
Version bumped to 0.6.307
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 8dccb17..472a027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.306],
+ [0.6.307],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 561c91574d77477beb1391b48fa32bcb001745f3
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 27 19:24:11 2020 -0700
Use PACKAGE_VERSION_* macros
Use PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, and
PACKAGE_VERSION_PATCHLEVEL macros instead of VIA_MAJOR_VERSION,
VIA_MINOR_VERSION, and VIA_PATCHLEVEL macros generated by configure.ac.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index deba61a..8dccb17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,16 +27,6 @@ AC_INIT([xf86-video-openchrome],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
-AC_DEFINE_UNQUOTED([VIA_MAJOR_VERSION],
- [$(echo $PACKAGE_VERSION | sed -e
's/^\([[0-9]]*\)\.[[0-9]]*\.[[0-9]]*/\1/')],
- [Major version])
-AC_DEFINE_UNQUOTED([VIA_MINOR_VERSION],
- [$(echo $PACKAGE_VERSION | sed -e
's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*/\1/')],
- [Minor version])
-AC_DEFINE_UNQUOTED([VIA_PATCHLEVEL],
- [$(echo $PACKAGE_VERSION | sed -e
's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)/\1/')],
- [Patch version])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
diff --git a/src/via_driver.c b/src/via_driver.c
index a7cea35..05e04c2 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -177,7 +177,9 @@ static XF86ModuleVersionInfo VIAVersRec = {
#else
XF86_VERSION_CURRENT,
#endif
- VIA_MAJOR_VERSION, VIA_MINOR_VERSION, VIA_PATCHLEVEL,
+ PACKAGE_VERSION_MAJOR,
+ PACKAGE_VERSION_MINOR,
+ PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
MOD_CLASS_VIDEODRV,
diff --git a/src/via_driver.h b/src/via_driver.h
index c1f023c..3e34f36 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -90,9 +90,9 @@
#define VIA_NAME "OpenChrome"
#define VIA_DRIVER_NAME "openchrome"
-#define VIA_DRIVER_VERSION (VIA_MAJOR_VERSION << 24) | \
- (VIA_MINOR_VERSION << 16) | \
- VIA_PATCHLEVEL
+#define VIA_DRIVER_VERSION (PACKAGE_VERSION_MAJOR << 24) | \
+ (PACKAGE_VERSION_MINOR << 16) | \
+ PACKAGE_VERSION_PATCHLEVEL
#define VIA_AGP_UPL_SIZE (1024*128)
#define VIA_DMA_DL_SIZE (1024*128)
commit d6544beda206466c616195bbcb571f6c8539ed9c
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 27 18:30:12 2020 -0700
Remove acinclude.m4
Commit 72c62d3 (Adjust for modular build.) introduced acinclude.m4.
The existence of this file causes PACKAGE_VERSION_MAJOR,
PACKAGE_VERSION_MINOR, and PACKAGE_VERSION_PATCHLEVEL macros not to
be defined (generated) inside config.h when a make file is generated.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 127eed9..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,91 +0,0 @@
-dnl Copyright 2005 Red Hat, Inc
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
-
-# XORG_DRIVER_CHECK_EXT()
-# --------------------------
-# Checks for the $1 define in xorg-server.h (from the sdk). If it
-# is defined, then add $1 to $REQUIRED_MODULES.
-
-AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include "xorg-server.h"
-#if !defined $1
-#error $1 not defined
-#endif
- ]])],
- [_EXT_CHECK=yes],
- [_EXT_CHECK=no])
- CFLAGS="$SAVE_CFLAGS"
- AC_MSG_CHECKING([if $1 is defined])
- AC_MSG_RESULT([$_EXT_CHECK])
- if test "$_EXT_CHECK" != no; then
- REQUIRED_MODULES="$REQUIRED_MODULES $2"
- fi
-])
-dnl Copyright 2005 Red Hat, Inc
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
-
-# XORG_RELEASE_VERSION
-# --------------------
-# Adds --with/without-release-string and changes the PACKAGE and
-# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
-
-AC_DEFUN([XORG_RELEASE_VERSION],[
- AC_ARG_WITH(release-version,
- AC_HELP_STRING([--with-release-version=STRING],
- [Use release version string in package name]),
- [RELEASE_VERSION="$withval"],
- [RELEASE_VERSION=""])
- if test "x$RELEASE_VERSION" != "x"; then
- PACKAGE="$PACKAGE-$RELEASE_VERSION"
- PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
- AC_MSG_NOTICE([Building with package name set to $PACKAGE])
- fi
-])
commit a17ac328b98693a307007302197ef3a7a99dcb8d
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 27 18:19:07 2020 -0700
Rename VIA_VERSION macro to VIA_DRIVER_VERSION
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index 9bcdd30..a7cea35 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -109,7 +109,7 @@ static const struct pci_id_match via_device_match[] = {
#endif /* HAVE_PCIACCESS */
_X_EXPORT DriverRec VIA = {
- VIA_VERSION,
+ VIA_DRIVER_VERSION,
VIA_DRIVER_NAME,
VIAIdentify,
#ifdef HAVE_PCIACCESS
@@ -429,7 +429,7 @@ via_pci_probe(DriverPtr driver, int entity_num,
NULL, NULL, NULL, NULL, NULL);
if (scrn != NULL) {
- scrn->driverVersion = VIA_VERSION;
+ scrn->driverVersion = VIA_DRIVER_VERSION;
scrn->driverName = VIA_DRIVER_NAME;
scrn->name = VIA_NAME;
scrn->Probe = NULL;
@@ -502,7 +502,7 @@ VIAProbe(DriverPtr drv, int flags)
if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
VIAPciChipsets, 0, 0, 0, 0, 0))) {
- pScrn->driverVersion = VIA_VERSION;
+ pScrn->driverVersion = VIA_DRIVER_VERSION;
pScrn->driverName = VIA_DRIVER_NAME;
pScrn->name = VIA_NAME;
pScrn->Probe = VIAProbe;
diff --git a/src/via_driver.h b/src/via_driver.h
index 0c218c1..c1f023c 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -90,7 +90,9 @@
#define VIA_NAME "OpenChrome"
#define VIA_DRIVER_NAME "openchrome"
-#define VIA_VERSION ((VIA_MAJOR_VERSION << 24) | (VIA_MINOR_VERSION <<
16) | VIA_PATCHLEVEL)
+#define VIA_DRIVER_VERSION (VIA_MAJOR_VERSION << 24) | \
+ (VIA_MINOR_VERSION << 16) | \
+ VIA_PATCHLEVEL
#define VIA_AGP_UPL_SIZE (1024*128)
#define VIA_DMA_DL_SIZE (1024*128)
commit 4b9b7da5bcf16bd3a5a3438ed456bf03d9f7c35d
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 27 17:30:52 2020 -0700
Change the name used to identify DDX in the Xorg.X.log log file
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index 9c50714..9bcdd30 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -110,7 +110,7 @@ static const struct pci_id_match via_device_match[] = {
_X_EXPORT DriverRec VIA = {
VIA_VERSION,
- DRIVER_NAME,
+ VIA_DRIVER_NAME,
VIAIdentify,
#ifdef HAVE_PCIACCESS
NULL,
@@ -430,8 +430,8 @@ via_pci_probe(DriverPtr driver, int entity_num,
if (scrn != NULL) {
scrn->driverVersion = VIA_VERSION;
- scrn->driverName = DRIVER_NAME;
- scrn->name = "CHROME";
+ scrn->driverName = VIA_DRIVER_NAME;
+ scrn->name = VIA_NAME;
scrn->Probe = NULL;
scrn->PreInit = VIAPreInit;
@@ -503,8 +503,8 @@ VIAProbe(DriverPtr drv, int flags)
if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
VIAPciChipsets, 0, 0, 0, 0, 0))) {
pScrn->driverVersion = VIA_VERSION;
- pScrn->driverName = DRIVER_NAME;
- pScrn->name = "CHROME";
+ pScrn->driverName = VIA_DRIVER_NAME;
+ pScrn->name = VIA_NAME;
pScrn->Probe = VIAProbe;
pScrn->PreInit = VIAPreInit;
pScrn->ScreenInit = VIAScreenInit;
diff --git a/src/via_driver.h b/src/via_driver.h
index 76e25c1..0c218c1 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -86,6 +86,12 @@
#include "via_vt1632.h"
#include "compat-api.h"
+
+
+#define VIA_NAME "OpenChrome"
+#define VIA_DRIVER_NAME "openchrome"
+#define VIA_VERSION ((VIA_MAJOR_VERSION << 24) | (VIA_MINOR_VERSION <<
16) | VIA_PATCHLEVEL)
+
#define VIA_AGP_UPL_SIZE (1024*128)
#define VIA_DMA_DL_SIZE (1024*128)
#define VIA_SCRATCH_SIZE (4*1024*1024)
@@ -103,9 +109,6 @@
#define AGP_PAGES 8192
#define AGP_SIZE (AGP_PAGE_SIZE * AGP_PAGES)
-#define DRIVER_NAME "openchrome"
-#define VIA_VERSION ((VIA_MAJOR_VERSION << 24) | (VIA_MINOR_VERSION << 16)
| VIA_PATCHLEVEL)
-
#define VIA_VQ_SIZE (256 * 1024)
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
commit e27fbe37a4df21919b0efedb4dfcdf73fe722b8b
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Aug 27 16:12:43 2020 -0700
Revert "Change the name used to identify DDX in the Xorg.X.log log file"
This reverts commit c8b364a006adf22753b0d693333eab4c2820d15b.
diff --git a/src/via_driver.c b/src/via_driver.c
index 180c5eb..9c50714 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -110,7 +110,7 @@ static const struct pci_id_match via_device_match[] = {
_X_EXPORT DriverRec VIA = {
VIA_VERSION,
- VIA_DRIVER_NAME,
+ DRIVER_NAME,
VIAIdentify,
#ifdef HAVE_PCIACCESS
NULL,
@@ -430,8 +430,8 @@ via_pci_probe(DriverPtr driver, int entity_num,
if (scrn != NULL) {
scrn->driverVersion = VIA_VERSION;
- scrn->driverName = VIA_DRIVER_NAME;
- scrn->name = VIA_NAME;
+ scrn->driverName = DRIVER_NAME;
+ scrn->name = "CHROME";
scrn->Probe = NULL;
scrn->PreInit = VIAPreInit;
diff --git a/src/via_driver.h b/src/via_driver.h
index 0c218c1..76e25c1 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -86,12 +86,6 @@
#include "via_vt1632.h"
#include "compat-api.h"
-
-
-#define VIA_NAME "OpenChrome"
-#define VIA_DRIVER_NAME "openchrome"
-#define VIA_VERSION ((VIA_MAJOR_VERSION << 24) | (VIA_MINOR_VERSION <<
16) | VIA_PATCHLEVEL)
-
#define VIA_AGP_UPL_SIZE (1024*128)
#define VIA_DMA_DL_SIZE (1024*128)
#define VIA_SCRATCH_SIZE (4*1024*1024)
@@ -109,6 +103,9 @@
#define AGP_PAGES 8192
#define AGP_SIZE (AGP_PAGE_SIZE * AGP_PAGES)
+#define DRIVER_NAME "openchrome"
+#define VIA_VERSION ((VIA_MAJOR_VERSION << 24) | (VIA_MINOR_VERSION << 16)
| VIA_PATCHLEVEL)
+
#define VIA_VQ_SIZE (256 * 1024)
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
