Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=b43b335a6ab2a096553dab43a7550f2de3794f60
commit b43b335a6ab2a096553dab43a7550f2de3794f60 Author: Krisztian VASAS <[email protected]> Date: Fri Jan 2 11:29:54 2009 +0100 xf86-video-fbdev-0.4.0-1-i686 - version bump - added a small patch diff --git a/source/x11/xf86-video-fbdev/01-make_isa_optional.patch1 b/source/x11/xf86-video-fbdev/01-make_isa_optional.patch1 new file mode 100644 index 0000000..5fcc66e --- /dev/null +++ b/source/x11/xf86-video-fbdev/01-make_isa_optional.patch1 @@ -0,0 +1,73 @@ +diff --git a/configure.ac b/configure.ac +index ec3d7aa..7e82996 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -59,6 +59,14 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + ++save_CFLAGS="$CFLAGS" ++CFLAGS="$XORG_CFLAGS" ++AC_CHECK_DECL(xf86ConfigIsaEntity, ++ [AC_DEFINE(HAVE_ISA, 1, [Have ISA support])], ++ [], ++ [#include "xf86.h"]) ++CFLAGS="$save_CFLAGS" ++ + AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes]) + if test "x$PCIACCESS" = xyes; then + AC_DEFINE(PCIACCESS, 1, [Use libpciaccess]) +diff --git a/src/fbdev.c b/src/fbdev.c +index df278f5..7f1a749 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -373,9 +373,7 @@ FBDevProbe(DriverPtr drv, int flags) + + for (i = 0; i < numDevSections; i++) { + Bool isIsa = FALSE; +-#ifndef XSERVER_LIBPCIACCESS + Bool isPci = FALSE; +-#endif + + dev = xf86FindOptionValue(devSections[i]->options,"fbdev"); + if (devSections[i]->busID) { +@@ -387,14 +385,18 @@ FBDevProbe(DriverPtr drv, int flags) + isPci = TRUE; + } else + #endif ++#ifdef HAVE_ISA + if (xf86ParseIsaBusString(devSections[i]->busID)) + isIsa = TRUE; ++ else ++#endif ++ 0; + + } + if (fbdevHWProbe(NULL,dev,NULL)) { + pScrn = NULL; +-#ifndef XSERVER_LIBPCIACCESS + if (isPci) { ++#ifndef XSERVER_LIBPCIACCESS + /* XXX what about when there's no busID set? */ + int entity; + +@@ -410,9 +412,9 @@ FBDevProbe(DriverPtr drv, int flags) + xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, + "claimed PCI slot %d:%d:%d\n",bus,device,func); + +- } else + #endif +- if (isIsa) { ++ } else if (isIsa) { ++#ifdef HAVE_ISA + int entity; + + entity = xf86ClaimIsaSlot(drv, 0, +@@ -420,6 +422,7 @@ FBDevProbe(DriverPtr drv, int flags) + pScrn = xf86ConfigIsaEntity(pScrn,0,entity, + NULL,RES_SHARED_VGA, + NULL,NULL,NULL,NULL); ++#endif + } else { + int entity; + diff --git a/source/x11/xf86-video-fbdev/FrugalBuild b/source/x11/xf86-video-fbdev/FrugalBuild index 8a1ad3e..1948c41 100644 --- a/source/x11/xf86-video-fbdev/FrugalBuild +++ b/source/x11/xf86-video-fbdev/FrugalBuild @@ -2,13 +2,15 @@ # Maintainer: Christian Hamar alias krix <[email protected]> pkgname=xf86-video-fbdev -pkgver=0.3.1 -pkgrel=3 +pkgver=0.4.0 +pkgrel=1 pkgdesc="X.Org driver for fbdev cards" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') -depends=('xorg-server>=1.4.0.90') +depends=('xorg-server>=1.5.99.3') makedepends=('randrproto' 'renderproto' 'xf86dgaproto' 'videoproto') Finclude xorg -sha1sums=('6b1cc6fbe0d1b34daff6cb202db6827007ec1cb5') +source=(${sour...@]} '01-make_isa_optional.patch1') +sha1sums=('b23da9224faac7e1bcc25e82aff4b453e71e406f' \ + '2328be67a7f0ab3c4eb7a315ccfb49e5b7e94a7d') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
