xf86-video-nv: 7 commits - configure.ac src/g80_driver.c src/g80_exa.c src/Makefile.am src/nv_driver.c src/nv_xaa.c src/riva_driver.c

[GitLab Mirror]

 configure.ac      |    3 +--
 src/Makefile.am   |    2 +-
 src/g80_driver.c  |    2 +-
 src/g80_exa.c     |    1 +
 src/nv_driver.c   |    2 +-
 src/nv_xaa.c      |    4 +++-
 src/riva_driver.c |    2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit eff27e0d6a18350cfd7ad226cacc538c15f49995
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:38:23 2024 -0800

    Fix warning: no previous prototype for ‘G80ExaInit’ [-Wmissing-prototypes]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/g80_exa.c b/src/g80_exa.c
index 0555cc6..a34d17e 100644
--- a/src/g80_exa.c
+++ b/src/g80_exa.c
@@ -28,6 +28,7 @@
 
 #include "g80_type.h"
 #include "g80_dma.h"
+#include "g80_exa.h"
 #include "g80_xaa.h"
 
 static void
commit fa0bd081e060b065a29dcd7679f04a0139773ca2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:24:25 2024 -0800

    Fix -Wdiscarded-qualifiers warning in G80PreInit
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 719b96c..b52fb40 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -163,7 +163,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     Bool primary;
     const rgb zeros = {0, 0, 0};
     const Gamma gzeros = {0.0, 0.0, 0.0};
-    char *s;
+    const char *s;
     CARD32 tmp;
     memType BAR1sizeKB;
 
commit 947720bc20f8dcba8502e1db46ae0f180c5fa8d0
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:10:39 2024 -0800

    Fix warning: ‘NVPatternROP’ defined but not used [-Wunused-const-variable=]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/nv_xaa.c b/src/nv_xaa.c
index f1e2dd4..76f8ae4 100644
--- a/src/nv_xaa.c
+++ b/src/nv_xaa.c
@@ -72,6 +72,7 @@ static const int NVCopyROP_PM[16] =
    0xFA             /* GXset */
 };
 
+#ifdef HAVE_XAA_H
 static const int NVPatternROP[16] =
 {
    0x00,
@@ -91,6 +92,7 @@ static const int NVPatternROP[16] =
    0x5F,
    0xFF
 };
+#endif
 
 void
 NVDmaKickoff(NVPtr pNv)
commit 0176634d5e14f59dbd93895f4056ece528efd950
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:09:14 2024 -0800

    Fix warning: ‘NVDMAKickoffCallback’ defined but not used [-Wunused-function]
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/nv_xaa.c b/src/nv_xaa.c
index bf2b4d2..f1e2dd4 100644
--- a/src/nv_xaa.c
+++ b/src/nv_xaa.c
@@ -291,6 +291,7 @@ void NVSync(ScrnInfoPtr pScrn)
     while(pNv->PGRAPH[0x0700/4]);
 }
 
+#ifdef HAVE_XAA_H
 static void
 NVDMAKickoffCallback (ScrnInfoPtr pScrn)
 {
@@ -300,7 +301,6 @@ NVDMAKickoffCallback (ScrnInfoPtr pScrn)
    pNv->DMAKickoffCallback = NULL;
 }
 
-#ifdef HAVE_XAA_H
 static void
 NVSetupForScreenToScreenCopy(
    ScrnInfoPtr pScrn, 
commit 57cfa71b2ca68a705c665c6b0ee920690b8eccb3
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:05:42 2024 -0800

    Fix 4 -Wdiscarded-qualifiers warnings
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 99b2990..070ec4c 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1295,7 +1295,7 @@ nvProbeDDC(ScrnInfoPtr pScrn, int index)
 
 Bool NVI2CInit(ScrnInfoPtr pScrn)
 {
-    char *mod = "i2c";
+    const char *mod = "i2c";
 
     if (xf86LoadSubModule(pScrn, mod)) {
 
diff --git a/src/riva_driver.c b/src/riva_driver.c
index 501266f..232568c 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -316,7 +316,7 @@ rivaProbeDDC(ScrnInfoPtr pScrn, int index)
 
 Bool RivaI2CInit(ScrnInfoPtr pScrn)
 {
-    char *mod = "i2c";
+    const char *mod = "i2c";
 
     if (xf86LoadSubModule(pScrn, mod)) {
 
commit 52db99b4d88c7dfdfa813bbeefd17f3c6f5751d9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:03:29 2024 -0800

    Add X.Org's standard C warning flags to AM_CFLAGS
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 456481c..c99bc28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS)
 nv_drv_la_LTLIBRARIES = nv_drv.la
 nv_drv_la_LDFLAGS = -module -avoid-version
 nv_drv_ladir = @moduledir@/drivers
commit 85198960a80ee751047551c332c5bad44bb2da92
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jan 8 14:01:21 2024 -0800

    configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
    
    AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008,
    so it's time to rely on it.
    
    Clears autoconf warnings:
    
    configure.ac:45: warning: The macro 'AC_PROG_LIBTOOL' is obsolete.
    configure.ac:45: You should run autoupdate.
    aclocal.m4:3515: AC_PROG_LIBTOOL is expanded from...
    configure.ac:45: the top level
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/configure.ac b/configure.ac
index 3dd4982..fa5e03f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,8 +41,7 @@ AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
 
 AH_TOP([#include "xorg-server.h"])