release 25.0.0

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

.gitlab-ci.yml

@@ -1,98 +0,0 @@
-# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
-#
-# This CI uses the freedesktop.org ci-templates.
-# Please see the ci-templates documentation for details:
-# https://freedesktop.pages.freedesktop.org/ci-templates/
-
-.templates_sha: &template_sha 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile
-
-
-include:
-  # Arch container builder template
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/arch.yml'
-  - project: 'freedesktop/ci-templates'
-    ref: *template_sha
-    file: '/templates/ci-fairy.yml'
-  - template: Security/SAST.gitlab-ci.yml
-
-
-stages:
-  - prep             # prep work like rebuilding the container images if there is a change
-  - build            # for actually building and testing things in a container
-  - test
-  - deploy
-
-
-variables:
-  FDO_UPSTREAM_REPO: 'xorg/driver/xf86-video-fbdev'
-  # The tag should be updated each time the list of packages is updated.
-  # Changing a tag forces the associated image to be rebuilt.
-  # Note: the tag has no meaning, we use a date format purely for readability
-  FDO_DISTRIBUTION_TAG:  '2023-10-01.0'
-  FDO_DISTRIBUTION_PACKAGES:  'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto xorg-server-devel pixman'
-
-
-#
-# Verify that commit messages are as expected
-#
-check-commits:
-  extends:
-    - .fdo.ci-fairy
-  stage: prep
-  script:
-    - ci-fairy check-commits --junit-xml=results.xml
-  except:
-    - master@xorg/driver/xf86-video-fbdev
-  variables:
-    GIT_DEPTH: 100
-  artifacts:
-    reports:
-      junit: results.xml
-
-#
-# Verify that the merge request has the allow-collaboration checkbox ticked
-#
-check-merge-request:
-  extends:
-    - .fdo.ci-fairy
-  stage: deploy
-  script:
-    - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
-  artifacts:
-    when: on_failure
-    reports:
-      junit: results.xml
-  allow_failure: true
-
-
-#
-# Build a container with the given tag and the packages pre-installed.
-# This only happens if the tag changes, otherwise the existing image is
-# re-used.
-#
-container-prep:
-  extends:
-    - .fdo.container-build@arch
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-
-
-#
-# The default build, runs on the image built above.
-#
-build:
-  stage: build
-  extends:
-    - .fdo.distribution-image@arch
-  script:
-    - autoreconf -ivf
-    - mkdir _builddir
-    - pushd _builddir > /dev/null
-    - ../configure --disable-silent-rules
-    - make
-    - make check
-    - make distcheck
-    - popd > /dev/null

README.md

@@ -1,18 +1,8 @@
 xf86-video-fbdev - video driver for framebuffer device
 ------------------------------------------------------
 
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-  https://lists.x.org/mailman/listinfo/xorg
-
 The primary development code repository can be found at:
 
-  https://gitlab.freedesktop.org/xorg/driver/xf86-video-fbdev
+  https://github.com/X11Libre/xf86-video-fbdev
 
 Please submit bug reports and requests to merge patches there.
-
-For patch submission instructions, see:
-
-  https://www.x.org/wiki/Development/Documentation/SubmittingPatches
-

configure.ac

@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xlibre-xf86-video-fbdev],
-        [0.5.2],
+        [25.0.0],
         [https://github.com/X11Libre/xf86-video-fbdev/issues],
         [xlibrexf86-video-fbdev])
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -51,9 +51,6 @@ AC_ARG_WITH(xorg-module-dir,
                            [Default xorg module directory]),
             [moduledir="$withval"],
             [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
-AC_ARG_ENABLE(pciaccess,     AS_HELP_STRING([--enable-pciaccess],
-                             [Enable use of libpciaccess (default: disabled)]),
-			     [PCIACCESS=$enableval], [PCIACCESS=no])
 
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -62,25 +59,10 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 
 # Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18 xproto fontsproto $REQUIRED_MODULES])
-
-AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
-if test "x$PCIACCESS" = xyes; then
-    AC_DEFINE(PCIACCESS, 1, [Use libpciaccess])
-    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-    XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
-fi
-
-# Checks for libraries.
-
+PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 
 AC_SUBST([moduledir])
 
-DRIVER_NAME=fbdev
-AC_SUBST([DRIVER_NAME])
-
-AC_CONFIG_FILES([
-                Makefile
-                src/Makefile
-                man/Makefile
-])
+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT

man/Makefile.am

@@ -24,11 +24,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = @DRIVER_NAME@.man
+driverman_PRE = fbdev.man
 
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME@.man
+EXTRA_DIST = fbdev.man
 
 CLEANFILES = $(driverman_DATA)
 

src/fbdev.c

@@ -2,10 +2,7 @@
  * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
  *	     Michel Dänzer, <michel@tungstengraphics.com>
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <string.h>
 
@@ -27,9 +24,7 @@
 
 #include "xf86xv.h"
 
-#ifdef XSERVER_LIBPCIACCESS
 #include <pciaccess.h>
-#endif
 
 /* for xf86{Depth,FbBpp}. i am a terrible person, and i am sorry. */
 #include "xf86Priv.h"
@@ -53,10 +48,8 @@ static Bool debug = 0;
 static const OptionInfoRec * FBDevAvailableOptions(int chipid, int busid);
 static void	FBDevIdentify(int flags);
 static Bool	FBDevProbe(DriverPtr drv, int flags);
-#ifdef XSERVER_LIBPCIACCESS
 static Bool	FBDevPciProbe(DriverPtr drv, int entity_num,
      struct pci_device *dev, intptr_t match_data);
-#endif
 static Bool	FBDevPreInit(ScrnInfoPtr pScrn, int flags);
 static Bool	FBDevScreenInit(ScreenPtr pScreen, int argc, char **argv);
 static Bool	FBDevCloseScreen(ScreenPtr pScreen);
@@ -77,7 +70,6 @@ enum { FBDEV_ROTATE_NONE=0, FBDEV_ROTATE_CW=270, FBDEV_ROTATE_UD=180, FBDEV_ROTA
 #define FBDEV_NAME		"FBDEV"
 #define FBDEV_DRIVER_NAME	"fbdev"
 
-#ifdef XSERVER_LIBPCIACCESS
 static const struct pci_id_match fbdev_device_match[] = {
     {
 	PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
@@ -86,7 +78,6 @@ static const struct pci_id_match fbdev_device_match[] = {
 
     { 0, 0, 0 },
 };
-#endif
 
 _X_EXPORT DriverRec FBDEV = {
 	FBDEV_VERSION,
@@ -100,11 +91,8 @@ _X_EXPORT DriverRec FBDEV = {
 	NULL,
 	0,
 	FBDevDriverFunc,
-
-#ifdef XSERVER_LIBPCIACCESS
     fbdev_device_match,
     FBDevPciProbe
-#endif
 };
 
 /* Supported "chipsets" */
@@ -131,8 +119,6 @@ static const OptionInfoRec FBDevOptions[] = {
 
 /* -------------------------------------------------------------------- */
 
-#ifdef XFree86LOADER
-
 MODULESETUPPROTO(FBDevSetup);
 
 static XF86ModuleVersionInfo FBDevVersRec =
@@ -166,8 +152,6 @@ FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 	}
 }
 
-#endif /* XFree86LOADER */
-
 /* -------------------------------------------------------------------- */
 /* our private data, and two functions to allocate/free this            */
 
@@ -255,7 +239,6 @@ fbdevValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, int flags)
     return fbdevHWValidMode(pScrn, mode, verbose, flags);
 }
 
-#ifdef XSERVER_LIBPCIACCESS
 static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
 			  struct pci_device *dev, intptr_t match_data)
 {
@@ -298,8 +281,6 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
 
     return (pScrn != NULL);
 }
-#endif
-
 
 static Bool
 FBDevProbe(DriverPtr drv, int flags)
@@ -308,9 +289,6 @@ FBDevProbe(DriverPtr drv, int flags)
 	ScrnInfoPtr pScrn;
        	GDevPtr *devSections;
 	int numDevSections;
-#ifndef XSERVER_LIBPCIACCESS
-	int bus,device,func;
-#endif
 	char *dev;
 	Bool foundScreen = FALSE;
 
@@ -331,35 +309,10 @@ FBDevProbe(DriverPtr drv, int flags)
 
 	    dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
 	    if (devSections[i]->busID) {
-#ifndef XSERVER_LIBPCIACCESS
-	        if (xf86ParsePciBusString(devSections[i]->busID,&bus,&device,
-					  &func)) {
-		    if (!xf86CheckPciSlot(bus,device,func))
-		        continue;
-		    isPci = TRUE;
-		}
-#endif
 	    }
 	    if (fbdevHWProbe(NULL,dev,NULL)) {
 		pScrn = NULL;
 		if (isPci) {
-#ifndef XSERVER_LIBPCIACCESS
-		    /* XXX what about when there's no busID set? */
-		    int entity;
-
-		    entity = xf86ClaimPciSlot(bus,device,func,drv,
-					      0,devSections[i],
-					      TRUE);
-		    pScrn = xf86ConfigPciEntity(pScrn,0,entity,
-						      NULL,RES_SHARED_VGA,
-						      NULL,NULL,NULL,NULL);
-		    /* xf86DrvMsg() can't be called without setting these */
-		    pScrn->driverName    = FBDEV_DRIVER_NAME;
-		    pScrn->name          = FBDEV_NAME;
-		    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
-			       "claimed PCI slot %d:%d:%d\n",bus,device,func);
-
-#endif
 		} else {
 		   int entity;
 
@@ -418,21 +371,8 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
 
 	fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
 
-#ifndef XSERVER_LIBPCIACCESS
-	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;
-
-	if (fPtr->pEnt->location.type == BUS_PCI &&
-	    xf86RegisterResources(fPtr->pEnt->index,NULL,ResExclusive)) {
-		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		   "xf86RegisterResources() found resource conflicts\n");
-		return FALSE;
-	}
-#else
 	if (fPtr->pEnt->location.type == BUS_PCI)
 	    pci_dev = fPtr->pEnt->location.id.pci;
-#endif
 	/* open device */
 	if (!fbdevHWInit(pScrn, pci_dev,
 			 xf86FindOptionValue(fPtr->pEnt->device->options,