fbdev: FBIOGET_FSCREENINFO + FBIOPUT_VSCREENINFO

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

bootstrap/xorg.yml

@@ -1210,3 +1210,138 @@ packages:
       - args: ['make', 'install']
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
+
+  - name: libxv
+    source:
+      subdir: 'bundled'
+      git: 'https://gitlab.freedesktop.org/xorg/lib/libxv.git'
+      tag: 'libXv-1.0.11'
+      version: '1.0.11'
+      tools_required:
+        - host-autoconf-v2.69
+        - host-automake-v1.16
+        - host-libtool
+        - host-pkg-config
+        - host-xorg-macros
+      regenerate:
+        - args: ['./autogen.sh']
+          environ:
+            NOCONFIGURE: 'yes'
+    tools_required:
+      - host-gcc
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-pkg-config
+    pkgs_required:
+      - mlibc
+      - xorg-util-macros
+      - xorg-proto
+      - libx11
+      - libxext
+      - libxfixes
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=x86_64-aero'
+        - '--prefix=/usr'
+        - '--sysconfdir=/etc'
+        - '--localstatedir=/var'
+        - '--disable-static'
+        - '--disable-malloc0returnsnull'
+        - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install-strip']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
+
+  - name: libxrandr
+    source:
+      subdir: 'bundled'
+      git: 'https://gitlab.freedesktop.org/xorg/lib/libxrandr.git'
+      tag: 'libXrandr-1.5.2'
+      version: '1.5.2'
+      tools_required:
+        - host-autoconf-v2.69
+        - host-automake-v1.16
+        - host-libtool
+        - host-pkg-config
+        - host-xorg-macros
+      regenerate:
+        - args: ['./autogen.sh']
+          environ:
+            NOCONFIGURE: 'yes'
+    tools_required:
+      - host-gcc
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-pkg-config
+    pkgs_required:
+      - mlibc
+      - xorg-util-macros
+      - xorg-proto
+      - libx11
+      - libxtrans
+      - libxrender
+      - libxext
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=x86_64-aero'
+        - '--prefix=/usr'
+        - '--sysconfdir=/etc'
+        - '--localstatedir=/var'
+        - '--disable-static'
+        - '--disable-malloc0returnsnull'
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install-strip']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
+
+  - name: xf86-video-fbdev
+    source:
+      subdir: 'bundled'
+      git: 'https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev.git'
+      tag: 'xf86-video-fbdev-0.5.0'
+      version: '0.5.0'
+      tools_required:
+        - host-autoconf-v2.69
+        - host-automake-v1.16
+        - host-libtool
+        - host-pkg-config
+        - host-xorg-macros
+      regenerate:
+        - args: ['./autogen.sh']
+          environ:
+            NOCONFIGURE: 'yes'
+    tools_required:
+      - host-gcc
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-pkg-config
+    pkgs_required:
+      - mlibc
+      - xorg-server
+      - xorg-util-macros
+      - libx11
+      - libxrandr
+      - libxrender
+      - libxv
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=x86_64-aero'
+        - '--prefix=/usr'
+        - '--sysconfdir=/etc'
+        - '--localstatedir=/var'
+        - '--disable-static'
+        - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
+        - '--disable-pciaccess'
+        environ:
+          SYSROOT: '@SYSROOT_DIR@'
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install-strip']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'

patches/xf86-video-fbdev/0001-fbdev-aero-specific-changes.patch

@@ -0,0 +1,112 @@
+From 4a125d73f79cffc1edb41c4a9e9c0524bbc0abbd Mon Sep 17 00:00:00 2001
+From: Andy-Python-Programmer <[email protected]>
+Date: Sat, 2 Jul 2022 18:40:03 +1000
+Subject: [PATCH] fbdev: aero specific changes
+
+Signed-off-by: Andy-Python-Programmer <[email protected]>
+---
+ .gitignore      | 2 ++
+ configure.ac    | 8 +++++---
+ src/Makefile.am | 2 +-
+ src/fbdev.c     | 8 +++++---
+ 4 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 1c9de22..69be940 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -76,3 +76,5 @@ core
+ #		Edit the following section as needed
+ # For example, !report.pc overrides *.pc. See 'man gitignore'
+ # 
++# editor configs:
++.vscode
+diff --git a/configure.ac b/configure.ac
+index 27778cd..11f5e38 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,9 +56,9 @@ AC_ARG_ENABLE(pciaccess,     AS_HELP_STRING([--enable-pciaccess],
+ 			     [PCIACCESS=$enableval], [PCIACCESS=no])
+ 
+ # Store the list of server defined optional extensions in REQUIRED_MODULES
+-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+-XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+-XORG_DRIVER_CHECK_EXT(XV, videoproto)
++# XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
++# XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
++# XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ 
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+@@ -86,6 +86,8 @@ AC_SUBST([moduledir])
+ DRIVER_NAME=fbdev
+ AC_SUBST([DRIVER_NAME])
+ 
++AC_SUBST([SYSROOT])
++
+ AC_CONFIG_FILES([
+                 Makefile
+                 src/Makefile
+diff --git a/src/Makefile.am b/src/Makefile.am
+index fbe420e..6e0779c 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -25,7 +25,7 @@
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+ AM_CFLAGS = @XORG_CFLAGS@
+ fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
+-fbdev_drv_la_LDFLAGS = -module -avoid-version
++fbdev_drv_la_LDFLAGS = -module -avoid-version -R@moduledir@ -L@SYSROOT@@moduledir@ -lfb -lfbdevhw -lshadow
+ fbdev_drv_ladir = @moduledir@/drivers
+ 
+ fbdev_drv_la_SOURCES = \
+diff --git a/src/fbdev.c b/src/fbdev.c
+index f25ef72..7facb9f 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -339,7 +339,7 @@ FBDevProbe(DriverPtr drv, int flags)
+ 
+ 	    dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
+ 	    if (devSections[i]->busID) {
+-#ifndef XSERVER_LIBPCIACCESS
++#ifdef XSERVER_LIBPCIACCESS
+ 	        if (xf86ParsePciBusString(devSections[i]->busID,&bus,&device,
+ 					  &func)) {
+ 		    if (!xf86CheckPciSlot(bus,device,func))
+@@ -358,7 +358,7 @@ FBDevProbe(DriverPtr drv, int flags)
+ 	    if (fbdevHWProbe(NULL,dev,NULL)) {
+ 		pScrn = NULL;
+ 		if (isPci) {
+-#ifndef XSERVER_LIBPCIACCESS
++#ifdef XSERVER_LIBPCIACCESS
+ 		    /* XXX what about when there's no busID set? */
+ 		    int entity;
+ 		    
+@@ -444,6 +444,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
+ 	fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+ 
+ #ifndef XSERVER_LIBPCIACCESS
++#if 0
+ 	pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+ 	/* XXX Is this right?  Can probably remove RAC_FB */
+ 	pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+@@ -454,6 +455,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
+ 		   "xf86RegisterResources() found resource conflicts\n");
+ 		return FALSE;
+ 	}
++#endif
+ #else
+ 	if (fPtr->pEnt->location.type == BUS_PCI)
+ 	    pci_dev = fPtr->pEnt->location.id.pci;
+@@ -1010,7 +1012,7 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	fPtr->CloseScreen = pScreen->CloseScreen;
+ 	pScreen->CloseScreen = FBDevCloseScreen;
+ 
+-#if XV
++#ifdef XV
+ 	{
+ 	    XF86VideoAdaptorPtr *ptr;
+ 
+-- 
+2.25.1
+

patches/xorg-server/0001-xserver-aero-specific-changes.patch

@@ -1,4 +1,4 @@
-From 58219693860f53ac12dd1849e5457bf30126a8ce Mon Sep 17 00:00:00 2001
+From ec91d28586ecf3df66e23da1ce94dbba3042cd86 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <[email protected]>
 Date: Thu, 30 Jun 2022 11:10:21 +1000
 Subject: [PATCH] xserver: aero specific changes
@@ -7,6 +7,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
 ---
  .gitignore                               |  2 ++
  configure.ac                             |  2 ++
+ hw/xfree86/common/xf86Bus.c              |  2 ++
  hw/xfree86/common/xf86Config.c           |  2 ++
  hw/xfree86/common/xf86Configure.c        |  1 +
  hw/xfree86/common/xf86Events.c           |  1 +
@@ -20,7 +21,7 @@ Signed-off-by: Andy-Python-Programmer <[email protected]>
  mi/mibitblt.c                            |  2 ++
  os/access.c                              |  2 +-
  os/utils.c                               |  4 +--
- 15 files changed, 47 insertions(+), 19 deletions(-)
+ 16 files changed, 49 insertions(+), 19 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index dc56b46..81d9886 100644
@@ -45,6 +46,26 @@ index 0909cc5..080b906 100644
  	AC_SUBST([XORG_LIBS])
  	AC_SUBST([XORG_SYS_LIBS])
  	AC_SUBST([XORG_INCS])
+diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
+index a8f1073..d7399aa 100644
+--- a/hw/xfree86/common/xf86Bus.c
++++ b/hw/xfree86/common/xf86Bus.c
+@@ -536,6 +536,7 @@ xf86GetDevFromEntity(int entityIndex, int instance)
+ void
+ xf86PostProbe(void)
+ {
++#if 0
+     if (fbSlotClaimed && (
+ #if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
+                              sbusSlotClaimed ||
+@@ -551,6 +552,7 @@ xf86PostProbe(void)
+         ))
+         FatalError("Cannot run in framebuffer mode. Please specify busIDs "
+                    "       for all framebuffer devices\n");
++#endif
+ }
+ 
+ int
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
 index 09d27ec..83be062 100644
 --- a/hw/xfree86/common/xf86Config.c