[openchrome-devel] xf86-video-openchrome: Branch 'main' - 15 commits - configure.ac src/drmmode_display.c src/via_dri.c src/via_driver.c src/via_driver.h src/via_exa.c src/via_exa_h2.c src/via_exa_h6.c src/via_memmgr.c src/via_xv.c src/via_xvmc.c src/via_xv_overlay.c

Kevin Brace kevinbrace at kemper.freedesktop.org
Wed Sep 21 00:42:53 UTC 2022 

 configure.ac          |    2 +-
 src/drmmode_display.c |    1 -
 src/via_dri.c         |    5 ++---
 src/via_driver.c      |    5 +++++
 src/via_driver.h      |    9 ---------
 src/via_exa.c         |    6 +-----
 src/via_exa_h2.c      |    3 ---
 src/via_exa_h6.c      |    3 ---
 src/via_memmgr.c      |    4 +++-
 src/via_xv.c          |    4 ----
 src/via_xv_overlay.c  |    1 -
 src/via_xvmc.c        |    5 +----
 12 files changed, 13 insertions(+), 35 deletions(-)

New commits:
commit 4e0a2273eb2bd4a5e1932a1d2245626a24a45f5d
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:30:45 2022 -0700

    Version bumped to 0.6.601
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/configure.ac b/configure.ac
index e065a51..b3678d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.600],
+        [0.6.601],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit 80022ba7db4c1b568e24c82abf5e857ffc08ed46
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:10 2022 -0700

    Stop including xf86Cursor.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_driver.h b/src/via_driver.h
index a6b4a62..15ea3a8 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -41,7 +41,6 @@
 
 #include "xf86.h"
 #include "xf86Crtc.h"
-#include "xf86Cursor.h"
 #include "xf86fbman.h"
 #include "xf86RandR12.h"
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
commit cf86b0bf7eeecd265fa97da89b181fdf70790e3a
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:10 2022 -0700

    Stop including regionstr.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_xv.c b/src/via_xv.c
index 247c91e..739dfe8 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -37,7 +37,6 @@
 #endif
 
 #include "compiler.h"
-#include "regionstr.h"
 #include "via_driver.h"
 
 #include "xf86xv.h"
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index c4f5763..0814efa 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -32,7 +32,6 @@
 #endif
 
 #include "compiler.h"
-#include "regionstr.h"
 
 #ifdef OPENCHROMEDRI
 
commit 91bbb39150b11c6ac088610a29d790a9691fc4b6
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:10 2022 -0700

    Stop including sarea.h from src/via_driver.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_driver.h b/src/via_driver.h
index a1b3e46..a6b4a62 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -71,7 +71,6 @@
 #define _XF86DRI_SERVER_
 #include "xf86dri.h"
 
-#include "sarea.h"
 #include "dri.h"
 #include "drm_fourcc.h"
 #include "GL/glxint.h"
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index a9978c9..c4f5763 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -52,6 +52,7 @@
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/XvMC.h>
 #include "via_xvmc.h"
+#include "sarea.h"
 #include "dristruct.h"
 #include "dri.h"
 #include "via_xvpriv.h"
commit 98e378679a21322ab7030af013eacde5cb63f84a
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Reduce unnecessary inclusion of sys/mman.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 5caaddd..6f635a1 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -31,7 +31,6 @@
 
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <sys/mman.h>
 #include "xf86str.h"
 #include "X11/Xatom.h"
 #include "micmap.h"
diff --git a/src/via_exa.c b/src/via_exa.c
index 12d4fa0..55a7daf 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -35,8 +35,6 @@
 
 #include <errno.h>
 
-#include <sys/mman.h>
-
 #include "via_driver.h"
 #include "via_regs.h"
 #include "via_dmabuffer.h"
commit bc329e9650bf00e1ae62551377c796ddc8d35be8
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including dixstruct.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_xv.c b/src/via_xv.c
index a97e976..247c91e 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -42,7 +42,6 @@
 
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
-#include "dixstruct.h"
 #include "via_xvpriv.h"
 #include "fourcc.h"
 
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index d3705d6..a9978c9 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -51,7 +51,6 @@
 #include "xf86xvmc.h"
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/XvMC.h>
-#include "dixstruct.h"
 #include "via_xvmc.h"
 #include "dristruct.h"
 #include "dri.h"
commit 2a82b5718315b6a27133a416b7584f133e521157
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including xf86_OSproc.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_dri.c b/src/via_dri.c
index db2ea0e..2921aab 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -31,7 +31,6 @@
 #include <errno.h>
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
 #include "xf86Priv.h"
 
 #define _XF86DRI_SERVER_
diff --git a/src/via_driver.h b/src/via_driver.h
index ba58eba..a1b3e46 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -40,7 +40,6 @@
 #include "vgaHW.h"
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
 #include "xf86Crtc.h"
 #include "xf86Cursor.h"
 #include "xf86fbman.h"
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index e08074a..8e77756 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -31,7 +31,6 @@
 #include <sys/mman.h>
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
 #include "xf86fbman.h"
 
 #ifdef OPENCHROMEDRI
diff --git a/src/via_xv.c b/src/via_xv.c
index 46ad9b8..a97e976 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -31,7 +31,6 @@
 #endif
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
 
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index 4f989e0..1e9b6f8 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
 
 #ifdef OPENCHROMEDRI
 #include "xf86drm.h"
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index ac43c6c..d3705d6 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -26,7 +26,6 @@
 #endif
 
 #include "xf86.h"
-#include "xf86_OSproc.h"
 
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
commit 120d5a2c1069334f0746c218c614bfec4d5dc505
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including errno.h from src/via_driver.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_dri.c b/src/via_dri.c
index cf3935c..db2ea0e 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -28,6 +28,8 @@
 #include "config.h"
 #endif
 
+#include <errno.h>
+
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Priv.h"
diff --git a/src/via_driver.c b/src/via_driver.c
index 3a209e8..5140e54 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -30,6 +30,8 @@
 #include "config.h"
 #endif
 
+#include <errno.h>
+
 #include "shadow.h"
 
 #include "globals.h"
diff --git a/src/via_driver.h b/src/via_driver.h
index 499371a..ba58eba 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -37,8 +37,6 @@
 
 #include "compiler.h"
 
-#include <errno.h>
-
 #include "vgaHW.h"
 
 #include "xf86.h"
diff --git a/src/via_exa.c b/src/via_exa.c
index fee54f4..12d4fa0 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -33,6 +33,8 @@
 #include "config.h"
 #endif
 
+#include <errno.h>
+
 #include <sys/mman.h>
 
 #include "via_driver.h"
diff --git a/src/via_memmgr.c b/src/via_memmgr.c
index 0113d56..e08074a 100644
--- a/src/via_memmgr.c
+++ b/src/via_memmgr.c
@@ -25,6 +25,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <errno.h>
+
 #include <sys/mman.h>
 
 #include "xf86.h"
commit ccd325d2bb2b96444bdf5fa76ef027990da8ccfb
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including mipointer.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_driver.h b/src/via_driver.h
index cae0452..499371a 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -54,7 +54,6 @@
 #include "exa.h"
 #include "fb.h"
 #include "fourcc.h"
-#include "mipointer.h"
 #ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
 #endif
commit 01a302215c8dd6a636be8ab0eb649f3a2317f17f
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including micmap.h from src/via_driver.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 9a7432c..3a209e8 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -34,6 +34,8 @@
 
 #include "globals.h"
 
+#include "micmap.h"
+
 #include "xf86.h"
 
 #ifdef HAVE_XEXTPROTO_71
diff --git a/src/via_driver.h b/src/via_driver.h
index 7e80519..cae0452 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -54,7 +54,6 @@
 #include "exa.h"
 #include "fb.h"
 #include "fourcc.h"
-#include "micmap.h"
 #include "mipointer.h"
 #ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
commit d7e1bc05584a34d62cbc2af2cf491d44b5050602
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including GL/gl.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_exa.c b/src/via_exa.c
index 2ff3905..fee54f4 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -33,7 +33,6 @@
 #include "config.h"
 #endif
 
-#include <GL/gl.h>
 #include <sys/mman.h>
 
 #include "via_driver.h"
commit 23c17f64480da705746e91f949f458644cae7f76
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including X11/Xarch.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_exa.c b/src/via_exa.c
index 72083c8..2ff3905 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -33,8 +33,6 @@
 #include "config.h"
 #endif
 
-#include <X11/Xarch.h>
-
 #include <GL/gl.h>
 #include <sys/mman.h>
 
diff --git a/src/via_exa_h2.c b/src/via_exa_h2.c
index 10fc825..20cb583 100644
--- a/src/via_exa_h2.c
+++ b/src/via_exa_h2.c
@@ -33,8 +33,6 @@
 #include "config.h"
 #endif
 
-#include <X11/Xarch.h>
-
 #include "via_driver.h"
 #include "via_regs.h"
 #include "via_dmabuffer.h"
diff --git a/src/via_exa_h6.c b/src/via_exa_h6.c
index 93c5e40..576eeb0 100644
--- a/src/via_exa_h6.c
+++ b/src/via_exa_h6.c
@@ -33,8 +33,6 @@
 #include "config.h"
 #endif
 
-#include <X11/Xarch.h>
-
 #include "via_driver.h"
 #include "via_regs.h"
 #include "via_dmabuffer.h"
commit bd107217bd910120adb351b6d315dd8279060e7a
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:09 2022 -0700

    Stop including miline.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_exa.c b/src/via_exa.c
index 2821eaa..72083c8 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <X11/Xarch.h>
-#include "miline.h"
 
 #include <GL/gl.h>
 #include <sys/mman.h>
diff --git a/src/via_exa_h2.c b/src/via_exa_h2.c
index 05f0d46..10fc825 100644
--- a/src/via_exa_h2.c
+++ b/src/via_exa_h2.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <X11/Xarch.h>
-#include "miline.h"
 
 #include "via_driver.h"
 #include "via_regs.h"
diff --git a/src/via_exa_h6.c b/src/via_exa_h6.c
index daf5c58..93c5e40 100644
--- a/src/via_exa_h6.c
+++ b/src/via_exa_h6.c
@@ -34,7 +34,6 @@
 #endif
 
 #include <X11/Xarch.h>
-#include "miline.h"
 
 #include "via_driver.h"
 #include "via_regs.h"
commit c3c602ec2672be498774e3d83d4236f34722022f
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:08 2022 -0700

    Stop including xf86Pci.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_dri.c b/src/via_dri.c
index cf0a6f5..cf3935c 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -32,8 +32,6 @@
 #include "xf86_OSproc.h"
 #include "xf86Priv.h"
 
-#include "xf86Pci.h"
-
 #define _XF86DRI_SERVER_
 #include "GL/glxtokens.h"
 #include "sarea.h"
diff --git a/src/via_driver.h b/src/via_driver.h
index e3e2cc2..7e80519 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -46,7 +46,6 @@
 #include "xf86Crtc.h"
 #include "xf86Cursor.h"
 #include "xf86fbman.h"
-#include "xf86Pci.h"
 #include "xf86RandR12.h"
 #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
 #include "xf86Resources.h"
diff --git a/src/via_xv.c b/src/via_xv.c
index b1ce782..46ad9b8 100644
--- a/src/via_xv.c
+++ b/src/via_xv.c
@@ -38,7 +38,6 @@
 #endif
 
 #include "compiler.h"
-#include "xf86Pci.h"
 #include "regionstr.h"
 #include "via_driver.h"
 
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index 04f6a0d..ac43c6c 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -33,7 +33,6 @@
 #endif
 
 #include "compiler.h"
-#include "xf86Pci.h"
 #include "regionstr.h"
 
 #ifdef OPENCHROMEDRI
commit 68e3e975179360330c9a219add6a597f259064f9
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Fri Sep 16 18:28:08 2022 -0700

    Stop including xf86cmap.h from src/via_driver.h
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 0b2bb6a..9a7432c 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -49,6 +49,7 @@
 #include "xf86RAC.h"
 #endif
 #include "xf86Crtc.h"
+#include "xf86cmap.h"
 
 #ifdef OPENCHROMEDRI
 #include "dri.h"
diff --git a/src/via_driver.h b/src/via_driver.h
index 08969a6..e3e2cc2 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -43,7 +43,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86cmap.h"
 #include "xf86Crtc.h"
 #include "xf86Cursor.h"
 #include "xf86fbman.h"

More information about the openchrome-devel mailing list