Attachment 291856 Details for Bug 428613 – pciaccess fix

[patch] pciaccess fix

xorg-x11-drv-vmware-10.15.2-pciaccess.patch (text/plain), 23.62 KB, created by Denis Leroy on 2008-01-16 14:53:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Leroy

Created: 2008-01-16 14:53:27 UTC

Size: 23.62 KB

patch

obsolete

>--- xf86-video-vmware-10.15.2/src/vmware.c.orig	2007-12-13 23:55:33.000000000 +0100
>+++ xf86-video-vmware-10.15.2/src/vmware.c	2007-12-13 23:55:28.000000000 +0100
>@@ -115,6 +115,18 @@
>     _VGA_EXCLUSIVE, _END
> };
> 
>+#if XSERVER_LIBPCIACCESS
>+
>+#define VMWARE_DEVICE_MATCH(d, i) \
>+    {PCI_VENDOR_VMWARE, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
>+
>+static const struct pci_id_match VMwareDeviceMatch[] = {
>+    VMWARE_DEVICE_MATCH (PCI_CHIP_VMWARE0405, 0 ),
>+    VMWARE_DEVICE_MATCH (PCI_CHIP_VMWARE0710, 0 ),
>+    { 0, 0, 0 },
>+};
>+#endif
>+
> /*
>  * Currently, even the PCI obedient 0405 chip still only obeys IOSE and
>  * MEMSE for the SVGA resources.  Thus, RES_EXCLUSIVE_VGA is required.
>@@ -597,17 +609,22 @@
>         return FALSE;
>     }
> 
>-    if (pVMWARE->PciInfo->chipType == PCI_CHIP_VMWARE0710) {
>+    if (DEVICE_ID(pVMWARE->PciInfo) == PCI_CHIP_VMWARE0710) {
>         pVMWARE->indexReg = domainIOBase +
>            SVGA_LEGACY_BASE_PORT + SVGA_INDEX_PORT*sizeof(uint32);
>         pVMWARE->valueReg = domainIOBase +
>            SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32);
>     } else {
>         /* Note:  This setting of valueReg causes unaligned I/O */
>+#if XSERVER_LIBPCIACCESS
>+        pVMWARE->portIOBase = pVMWARE->PciInfo->regions[0].base_addr;
>+#else
>+        pVMWARE->portIOBase = pVMWARE->PciInfo->ioBase[0];
>+#endif
>         pVMWARE->indexReg = domainIOBase +
>-           pVMWARE->PciInfo->ioBase[0] + SVGA_INDEX_PORT;
>+           pVMWARE->portIOBase + SVGA_INDEX_PORT;
>         pVMWARE->valueReg = domainIOBase +
>-           pVMWARE->PciInfo->ioBase[0] + SVGA_VALUE_PORT;
>+           pVMWARE->portIOBase + SVGA_VALUE_PORT;
>     }
>     xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
>                "VMware SVGA regs at (0x%04lx, 0x%04lx)\n",
>@@ -636,8 +653,10 @@
>         return FALSE;
>     }
> 
>+#if !XSERVER_LIBPCIACCESS
>     pVMWARE->PciTag = pciTag(pVMWARE->PciInfo->bus, pVMWARE->PciInfo->device,
>                              pVMWARE->PciInfo->func);
>+#endif
>     pVMWARE->Primary = xf86IsPrimaryPci(pVMWARE->PciInfo);
> 
>     pScrn->monitor = pScrn->confScreen->monitor;
>@@ -853,10 +872,10 @@
>     }
> 
>     from = X_PROBED;
>-    pScrn->chipset = (char*)xf86TokenToString(VMWAREChipsets, pVMWARE->PciInfo->chipType);
>+    pScrn->chipset = (char*)xf86TokenToString(VMWAREChipsets, DEVICE_ID(pVMWARE->PciInfo));
> 
>     if (!pScrn->chipset) {
>-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ChipID 0x%04x is not recognised\n", pVMWARE->PciInfo->chipType);
>+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ChipID 0x%04x is not recognised\n", DEVICE_ID(pVMWARE->PciInfo));
>         return FALSE;
>     }
> 
>@@ -983,14 +1002,32 @@
> static Bool
> VMWAREMapMem(ScrnInfoPtr pScrn)
> {
>-    VMWAREPtr pVMWARE;
>+    VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
>+#if XSERVER_LIBPCIACCESS
>+    int err;
>+    struct pci_device *const device = pVMWARE->PciInfo;
>+#endif
> 
>-    pVMWARE = VMWAREPTR(pScrn);
>+#if XSERVER_LIBPCIACCESS
>+   err = pci_device_map_range(device,
>+                              pVMWARE->memPhysBase,
>+                              pVMWARE->videoRam,
>+                              PCI_DEV_MAP_FLAG_WRITABLE | 
>+                              PCI_DEV_MAP_FLAG_WRITE_COMBINE,
>+                              (void **) &pVMWARE->FbBase);
>+   if (err) {
>+       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>+                  "Unable to map frame buffer BAR. %s (%d)\n",
>+                  strerror (err), err);
>+       return FALSE;
>+   }
> 
>+#else
>     pVMWARE->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
>                                     pVMWARE->PciTag,
>                                     pVMWARE->memPhysBase,
>                                     pVMWARE->videoRam);
>+#endif
>     if (!pVMWARE->FbBase)
>         return FALSE;
> 
>@@ -1196,6 +1233,10 @@
> VMWAREInitFIFO(ScrnInfoPtr pScrn)
> {
>     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
>+#if XSERVER_LIBPCIACCESS
>+    struct pci_device *const device = pVMWARE->PciInfo;
>+    int err;
>+#endif
>     CARD32* vmwareFIFO;
>     Bool extendedFifo;
>     int min;
>@@ -1204,10 +1245,23 @@
> 
>     pVMWARE->mmioPhysBase = vmwareReadReg(pVMWARE, SVGA_REG_MEM_START);
>     pVMWARE->mmioSize = vmwareReadReg(pVMWARE, SVGA_REG_MEM_SIZE) & ~3;
>+#if XSERVER_LIBPCIACCESS
>+    err = pci_device_map_range(device, pVMWARE->mmioPhysBase,
>+                               pVMWARE->mmioSize,
>+                               PCI_DEV_MAP_FLAG_WRITABLE,
>+                               (void **) &pVMWARE->mmioVirtBase);
>+    if (err) {
>+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
>+                   "Unable to map mmio BAR. %s (%d)\n",
>+                   strerror (err), err);
>+        return;
>+    }
>+#else
>     pVMWARE->mmioVirtBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
>                                           pVMWARE->PciTag,
>                                           pVMWARE->mmioPhysBase,
>                                           pVMWARE->mmioSize);
>+#endif
>     vmwareFIFO = pVMWARE->vmwareFIFO = (CARD32*)pVMWARE->mmioVirtBase;
> 
>     extendedFifo = pVMWARE->vmwareCapability & SVGA_CAP_EXTENDED_FIFO;
>@@ -1228,7 +1282,11 @@
>     TRACEPOINT
> 
>     vmwareWriteReg(pVMWARE, SVGA_REG_CONFIG_DONE, 0);
>+#if XSERVER_LIBPCIACCESS
>+    pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize);
>+#else
>     xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize);
>+#endif
> }
> 
> static Bool
>@@ -1674,6 +1732,47 @@
>     return MODE_OK;
> }
> 
>+#if XSERVER_LIBPCIACCESS
>+static Bool
>+VMwarePciProbe (DriverPtr           drv,
>+                int                 entity_num,
>+                struct pci_device   *device,
>+                intptr_t            match_data)
>+{
>+    ScrnInfoPtr     scrn = NULL;
>+    EntityInfoPtr   entity;
>+    /*I830EntPtr	    i830_ent = NULL;*/
>+    DevUnion	    *private;
>+
>+    scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets,
>+                               NULL, NULL, NULL, NULL, NULL);
>+    if (scrn != NULL) {
>+        scrn->driverVersion = VMWARE_DRIVER_VERSION;
>+        scrn->driverName = VMWARE_DRIVER_NAME;
>+        scrn->name = VMWARE_NAME;
>+        scrn->Probe = NULL;
>+    }
>+
>+    entity = xf86GetEntityInfo(entity_num);
>+    switch (DEVICE_ID(device)) {
>+    case PCI_CHIP_VMWARE0405:
>+    case PCI_CHIP_VMWARE0710:
>+        xf86MsgVerb(X_INFO, 4, "VMwarePciProbe: Valid device\n");
>+        scrn->PreInit = VMWAREPreInit;
>+        scrn->ScreenInit = VMWAREScreenInit;
>+        scrn->SwitchMode = VMWARESwitchMode;
>+        scrn->EnterVT = VMWAREEnterVT;
>+        scrn->LeaveVT = VMWARELeaveVT;
>+        scrn->FreeScreen = VMWAREFreeScreen;
>+        scrn->ValidMode = VMWAREValidMode;
>+        break;
>+    default:
>+        xf86MsgVerb(X_INFO, 4, "VMwarePciProbe: Unknown device\n");
>+    }
>+    return scrn != NULL;
>+}
>+#else 
>+
> static Bool
> VMWAREProbe(DriverPtr drv, int flags)
> {
>@@ -1733,19 +1832,28 @@
>     }
>     return foundScreen;
> }
>+#endif
> 
> 
> _X_EXPORT DriverRec VMWARE = {
>     VMWARE_DRIVER_VERSION,
>     VMWARE_DRIVER_NAME,
>     VMWAREIdentify,
>+#if XSERVER_LIBPCIACCESS
>+    NULL,
>+#else
>     VMWAREProbe,
>+#endif
>     VMWAREAvailableOptions,
>     NULL,
>     0,
> #if VMWARE_DRIVER_FUNC
>     VMWareDriverFunc,
> #endif
>+#if XSERVER_LIBPCIACCESS
>+    VMwareDeviceMatch,
>+    VMwarePciProbe,
>+#endif
> };
> 
> #ifdef XFree86LOADER
>--- xf86-video-vmware-10.15.2/src/vmware.h.orig	2007-12-13 23:56:07.000000000 +0100
>+++ xf86-video-vmware-10.15.2/src/vmware.h	2007-12-13 23:56:11.000000000 +0100
>@@ -16,6 +16,11 @@
> 
> #include <X11/extensions/panoramiXproto.h>
> 
>+#include "xorg-server.h"
>+#ifdef XSERVER_LIBPCIACCESS
>+#include <pciaccess.h>
>+#endif
>+
> #include "compiler.h"	        /* inb/outb */
> 
> #include "xf86PciInfo.h"	/* pci vendor id */
>@@ -55,8 +60,12 @@
> 
> typedef struct {
>     EntityInfoPtr pEnt;
>+#if XSERVER_LIBPCIACCESS
>+    struct pci_device *PciInfo;
>+#else
>     pciVideoPtr PciInfo;
>     PCITAG PciTag;
>+#endif
>     Bool Primary;
>     int depth;
>     int bitsPerPixel;
>@@ -68,6 +77,7 @@
>     unsigned long fbOffset;
>     unsigned long fbPitch;
>     unsigned long ioBase;
>+    unsigned long portIOBase;
>     int maxWidth;
>     int maxHeight;
>     unsigned int vmwareCapability;
>@@ -181,6 +191,20 @@
> /* Undefine this to kill all acceleration */
> #define ACCELERATE_OPS
> 
>+#if XSERVER_LIBPCIACCESS
>+#define VENDOR_ID(p)      (p)->vendor_id
>+#define DEVICE_ID(p)      (p)->device_id
>+#define SUBVENDOR_ID(p)   (p)->subvendor_id
>+#define SUBSYS_ID(p)      (p)->subdevice_id
>+#define CHIP_REVISION(p)  (p)->revision
>+#else
>+#define VENDOR_ID(p)      (p)->vendor
>+#define DEVICE_ID(p)      (p)->chipType
>+#define SUBVENDOR_ID(p)   (p)->subsysVendor
>+#define SUBSYS_ID(p)      (p)->subsysCard
>+#define CHIP_REVISION(p)  (p)->chipRev
>+#endif
>+
> void vmwareWriteReg(
>    VMWAREPtr pVMWARE, int index, CARD32 value
>    );
>--- xf86-video-vmware-10.15.2/configure.orig	2007-12-14 00:08:08.000000000 +0100
>+++ xf86-video-vmware-10.15.2/configure	2007-12-14 00:09:07.000000000 +0100
>@@ -876,6 +876,10 @@
> PKG_CONFIG
> XORG_CFLAGS
> XORG_LIBS
>+PCIACCESS_CFLAGS
>+PCIACCESS_LIBS
>+XSERVER_LIBPCIACCESS_TRUE
>+XSERVER_LIBPCIACCESS_FALSE
> moduledir
> DRIVER_NAME
> APP_MAN_SUFFIX
>@@ -910,7 +914,9 @@
> FFLAGS
> PKG_CONFIG
> XORG_CFLAGS
>-XORG_LIBS'
>+XORG_LIBS
>+PCIACCESS_CFLAGS
>+PCIACCESS_LIBS'
> 
> 
> # Initialize some variables set by options.
>@@ -1530,6 +1536,10 @@
>   PKG_CONFIG  path to pkg-config utility
>   XORG_CFLAGS C compiler flags for XORG, overriding pkg-config
>   XORG_LIBS   linker flags for XORG, overriding pkg-config
>+  PCIACCESS_CFLAGS
>+              C compiler flags for PCIACCESS, overriding pkg-config
>+  PCIACCESS_LIBS
>+              linker flags for PCIACCESS, overriding pkg-config
> 
> Use these variables to override the choices made by `configure' or to help
> it to find libraries and programs with nonstandard names/locations.
>@@ -4359,7 +4369,7 @@
>   ;;
> *-*-irix6*)
>   # Find out which ABI we are using.
>-  echo '#line 4362 "configure"' > conftest.$ac_ext
>+  echo '#line 4372 "configure"' > conftest.$ac_ext
>   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>@@ -7102,11 +7112,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:7105: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:7115: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:7109: \$? = $ac_status" >&5
>+   echo "$as_me:7119: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -7392,11 +7402,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:7395: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:7405: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:7399: \$? = $ac_status" >&5
>+   echo "$as_me:7409: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -7496,11 +7506,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:7499: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:7509: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:7503: \$? = $ac_status" >&5
>+   echo "$as_me:7513: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -9845,7 +9855,7 @@
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
>-#line 9848 "configure"
>+#line 9858 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
>@@ -9945,7 +9955,7 @@
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
>-#line 9948 "configure"
>+#line 9958 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
>@@ -12365,11 +12375,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:12368: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:12378: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:12372: \$? = $ac_status" >&5
>+   echo "$as_me:12382: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -12469,11 +12479,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:12472: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:12482: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:12476: \$? = $ac_status" >&5
>+   echo "$as_me:12486: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -14031,11 +14041,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:14034: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:14044: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:14038: \$? = $ac_status" >&5
>+   echo "$as_me:14048: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -14135,11 +14145,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:14138: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:14148: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:14142: \$? = $ac_status" >&5
>+   echo "$as_me:14152: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -16322,11 +16332,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:16325: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:16335: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:16329: \$? = $ac_status" >&5
>+   echo "$as_me:16339: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -16612,11 +16622,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:16615: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:16625: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:16619: \$? = $ac_status" >&5
>+   echo "$as_me:16629: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings other than the usual output.
>@@ -16716,11 +16726,11 @@
>    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:16719: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:16729: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:16723: \$? = $ac_status" >&5
>+   echo "$as_me:16733: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>@@ -20811,6 +20821,193 @@
> 
> fi
> 
>+save_CFLAGS="$CFLAGS"
>+CFLAGS="$XORG_CFLAGS"
>+{ echo "$as_me:$LINENO: checking whether XSERVER_LIBPCIACCESS is declared" >&5
>+echo $ECHO_N "checking whether XSERVER_LIBPCIACCESS is declared... $ECHO_C" >&6; }
>+if test "${ac_cv_have_decl_XSERVER_LIBPCIACCESS+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  cat >conftest.$ac_ext <<_ACEOF
>+/* confdefs.h.  */
>+_ACEOF
>+cat confdefs.h >>conftest.$ac_ext
>+cat >>conftest.$ac_ext <<_ACEOF
>+/* end confdefs.h.  */
>+#include "xorg-server.h"
>+
>+int
>+main ()
>+{
>+#ifndef XSERVER_LIBPCIACCESS
>+  (void) XSERVER_LIBPCIACCESS;
>+#endif
>+
>+  ;
>+  return 0;
>+}
>+_ACEOF
>+rm -f conftest.$ac_objext
>+if { (ac_try="$ac_compile"
>+case "(($ac_try" in
>+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
>+  *) ac_try_echo=$ac_try;;
>+esac
>+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
>+  (eval "$ac_compile") 2>conftest.er1
>+  ac_status=$?
>+  grep -v '^ *+' conftest.er1 >conftest.err
>+  rm -f conftest.er1
>+  cat conftest.err >&5
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); } && {
>+	 test -z "$ac_c_werror_flag" ||
>+	 test ! -s conftest.err
>+       } && test -s conftest.$ac_objext; then
>+  ac_cv_have_decl_XSERVER_LIBPCIACCESS=yes
>+else
>+  echo "$as_me: failed program was:" >&5
>+sed 's/^/| /' conftest.$ac_ext >&5
>+
>+	ac_cv_have_decl_XSERVER_LIBPCIACCESS=no
>+fi
>+
>+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
>+fi
>+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&5
>+echo "${ECHO_T}$ac_cv_have_decl_XSERVER_LIBPCIACCESS" >&6; }
>+if test $ac_cv_have_decl_XSERVER_LIBPCIACCESS = yes; then
>+  XSERVER_LIBPCIACCESS=yes
>+else
>+  XSERVER_LIBPCIACCESS=no
>+fi
>+
>+CFLAGS="$save_CFLAGS"
>+
>+if test x$XSERVER_LIBPCIACCESS = xyes; then
>+
>+pkg_failed=no
>+{ echo "$as_me:$LINENO: checking for PCIACCESS" >&5
>+echo $ECHO_N "checking for PCIACCESS... $ECHO_C" >&6; }
>+
>+if test -n "$PKG_CONFIG"; then
>+    if test -n "$PCIACCESS_CFLAGS"; then
>+        pkg_cv_PCIACCESS_CFLAGS="$PCIACCESS_CFLAGS"
>+    else
>+        if test -n "$PKG_CONFIG" && \
>+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.8.0\"") >&5
>+  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+  pkg_cv_PCIACCESS_CFLAGS=`$PKG_CONFIG --cflags "pciaccess >= 0.8.0" 2>/dev/null`
>+else
>+  pkg_failed=yes
>+fi
>+    fi
>+else
>+	pkg_failed=untried
>+fi
>+if test -n "$PKG_CONFIG"; then
>+    if test -n "$PCIACCESS_LIBS"; then
>+        pkg_cv_PCIACCESS_LIBS="$PCIACCESS_LIBS"
>+    else
>+        if test -n "$PKG_CONFIG" && \
>+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pciaccess >= 0.8.0\"") >&5
>+  ($PKG_CONFIG --exists --print-errors "pciaccess >= 0.8.0") 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+  pkg_cv_PCIACCESS_LIBS=`$PKG_CONFIG --libs "pciaccess >= 0.8.0" 2>/dev/null`
>+else
>+  pkg_failed=yes
>+fi
>+    fi
>+else
>+	pkg_failed=untried
>+fi
>+
>+
>+
>+if test $pkg_failed = yes; then
>+
>+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
>+        _pkg_short_errors_supported=yes
>+else
>+        _pkg_short_errors_supported=no
>+fi
>+        if test $_pkg_short_errors_supported = yes; then
>+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pciaccess >= 0.8.0"`
>+        else
>+	        PCIACCESS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pciaccess >= 0.8.0"`
>+        fi
>+	# Put the nasty error message in config.log where it belongs
>+	echo "$PCIACCESS_PKG_ERRORS" >&5
>+
>+	{ { echo "$as_me:$LINENO: error: Package requirements (pciaccess >= 0.8.0) were not met:
>+
>+$PCIACCESS_PKG_ERRORS
>+
>+Consider adjusting the PKG_CONFIG_PATH environment variable if you
>+installed software in a non-standard prefix.
>+
>+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
>+and PCIACCESS_LIBS to avoid the need to call pkg-config.
>+See the pkg-config man page for more details.
>+" >&5
>+echo "$as_me: error: Package requirements (pciaccess >= 0.8.0) were not met:
>+
>+$PCIACCESS_PKG_ERRORS
>+
>+Consider adjusting the PKG_CONFIG_PATH environment variable if you
>+installed software in a non-standard prefix.
>+
>+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
>+and PCIACCESS_LIBS to avoid the need to call pkg-config.
>+See the pkg-config man page for more details.
>+" >&2;}
>+   { (exit 1); exit 1; }; }
>+elif test $pkg_failed = untried; then
>+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
>+is in your PATH or set the PKG_CONFIG environment variable to the full
>+path to pkg-config.
>+
>+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
>+and PCIACCESS_LIBS to avoid the need to call pkg-config.
>+See the pkg-config man page for more details.
>+
>+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
>+See \`config.log' for more details." >&5
>+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
>+is in your PATH or set the PKG_CONFIG environment variable to the full
>+path to pkg-config.
>+
>+Alternatively, you may set the environment variables PCIACCESS_CFLAGS
>+and PCIACCESS_LIBS to avoid the need to call pkg-config.
>+See the pkg-config man page for more details.
>+
>+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
>+See \`config.log' for more details." >&2;}
>+   { (exit 1); exit 1; }; }
>+else
>+	PCIACCESS_CFLAGS=$pkg_cv_PCIACCESS_CFLAGS
>+	PCIACCESS_LIBS=$pkg_cv_PCIACCESS_LIBS
>+        { echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6; }
>+	:
>+fi
>+fi
>+
>+
>+
>+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
>+  XSERVER_LIBPCIACCESS_TRUE=
>+  XSERVER_LIBPCIACCESS_FALSE='#'
>+else
>+  XSERVER_LIBPCIACCESS_TRUE='#'
>+  XSERVER_LIBPCIACCESS_FALSE=
>+fi
>+
> 
> 
> 
>@@ -21062,6 +21259,13 @@
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
>+if test -z "${XSERVER_LIBPCIACCESS_TRUE}" && test -z "${XSERVER_LIBPCIACCESS_FALSE}"; then
>+  { { echo "$as_me:$LINENO: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
>+Usually this means the macro was only invoked conditionally." >&5
>+echo "$as_me: error: conditional \"XSERVER_LIBPCIACCESS\" was never defined.
>+Usually this means the macro was only invoked conditionally." >&2;}
>+   { (exit 1); exit 1; }; }
>+fi
> 
> : ${CONFIG_STATUS=./config.status}
> ac_clean_files_save=$ac_clean_files
>@@ -21743,6 +21947,10 @@
> PKG_CONFIG!$PKG_CONFIG$ac_delim
> XORG_CFLAGS!$XORG_CFLAGS$ac_delim
> XORG_LIBS!$XORG_LIBS$ac_delim
>+PCIACCESS_CFLAGS!$PCIACCESS_CFLAGS$ac_delim
>+PCIACCESS_LIBS!$PCIACCESS_LIBS$ac_delim
>+XSERVER_LIBPCIACCESS_TRUE!$XSERVER_LIBPCIACCESS_TRUE$ac_delim
>+XSERVER_LIBPCIACCESS_FALSE!$XSERVER_LIBPCIACCESS_FALSE$ac_delim
> moduledir!$moduledir$ac_delim
> DRIVER_NAME!$DRIVER_NAME$ac_delim
> APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
>@@ -21761,7 +21969,7 @@
> LTLIBOBJS!$LTLIBOBJS$ac_delim
> _ACEOF
> 
>-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
>+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
>     break
>   elif $ac_last_try; then
>     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Actions: View | Diff

Attachments on bug 428613: 291598 | 291599 | 291856