Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=6e4bf3d90effe629fc521f8de07573787d8694c0
commit 6e4bf3d90effe629fc521f8de07573787d8694c0
Author: bouleetbil <bouleet...@frogdev.info>
Date: Fri Sep 11 09:37:15 2009 +0200
xf86-video-nv-2.1.15-1-i686
*version bump
diff --git a/source/x11/xf86-video-nv/FixRessources.diff
b/source/x11/xf86-video-nv/FixRessources.diff
deleted file mode 100644
index e6b289c..0000000
--- a/source/x11/xf86-video-nv/FixRessources.diff
+++ /dev/null
@@ -1,195 +0,0 @@
-From 445498d2cc977b8c4f22fca881c75637dc7b058a Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airl...@redhat.com>
-Date: Tue, 28 Jul 2009 03:32:32 +0000
-Subject: nv: update for resources/RAC API removal
-
----
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index 7e06358..17c85f0 100644
---- a/src/g80_driver.c
-+++ b/src/g80_driver.c
-@@ -29,8 +29,9 @@
- #include <string.h>
-
- #include <xf86_OSproc.h>
-+#ifndef XSERVER_LIBPCIACCESS
- #include <xf86Resources.h>
--#include <xf86RandR12.h>
-+#endif
- #include <mipointer.h>
- #include <mibstore.h>
- #include <micmap.h>
-@@ -43,6 +44,7 @@
- #include <X11/extensions/dpms.h>
- #endif
-
-+#include <xf86RandR12.h>
-
- #include "nv_const.h"
- #include "g80_type.h"
-@@ -229,8 +231,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
- }
-
- /* Disable VGA access */
-+#ifndef XSERVER_LIBPCIACCESS
- xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
-+#endif
-
- pScrn->monitor = pScrn->confScreen->monitor;
-
-@@ -314,11 +318,13 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "MMIO registers mapped at %p\n",
- (void*)pNv->reg);
-
-+#ifndef XSERVER_LIBPCIACCESS
- if(xf86RegisterResources(pEnt->index, NULL, ResExclusive)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "xf86RegisterResources() found "
- "resource conflicts\n");
- goto fail;
- }
-+#endif
-
- pNv->architecture = pNv->reg[0] >> 20 & 0x1ff;
- tmp = pNv->reg[0x0010020C/4];
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 3a396e0..a7cf2dc 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -1264,8 +1264,10 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- }
-
-+#ifndef XSERVER_LIBPCIACCESS
- xf86SetOperatingState(resVgaIo, pNv->pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pNv->pEnt->index, ResDisableOpr);
-+#endif
-
- /* Set pScrn->monitor */
- pScrn->monitor = pScrn->confScreen->monitor;
-@@ -1642,6 +1644,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
- xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
- (unsigned long)pNv->IOAddress);
-
-+#ifndef XSERVER_LIBPCIACCESS
- if (xf86RegisterResources(pNv->pEnt->index, NULL, ResExclusive)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "xf86RegisterResources() found resource conflicts\n");
-@@ -1649,6 +1652,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
- NVFreeRec(pScrn);
- return FALSE;
- }
-+#endif
-
- switch (pNv->Chipset & 0x0ff0) {
- case 0x0100: /* GeForce 256 */
-diff --git a/src/nv_include.h b/src/nv_include.h
-index b579b37..4442621 100644
---- a/src/nv_include.h
-+++ b/src/nv_include.h
-@@ -8,7 +8,11 @@
- /* All drivers should typically include these */
- #include "xf86.h"
- #include "xf86_OSproc.h"
-+
-+#ifndef XSERVER_LIBPCIACCESS
- #include "xf86Resources.h"
-+#include "xf86RAC.h"
-+#endif
- #include "compiler.h"
-
- /* Drivers for PCI hardware need this */
-@@ -29,8 +33,6 @@
-
- #include "vbe.h"
-
--#include "xf86RAC.h"
--
- #include "nv_const.h"
-
- #include "dixstruct.h"
-diff --git a/src/nv_video.c b/src/nv_video.c
-index e11e0d0..6b13e5f 100644
---- a/src/nv_video.c
-+++ b/src/nv_video.c
-@@ -4,7 +4,6 @@
-
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Resources.h"
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
-diff --git a/src/riva_driver.c b/src/riva_driver.c
-index 3540fe9..afe0972 100644
---- a/src/riva_driver.c
-+++ b/src/riva_driver.c
-@@ -396,8 +396,10 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- }
-
-+#ifndef XSERVER_LIBPCIACCESS
- xf86SetOperatingState(resVgaIo, pRiva->pEnt->index, ResUnusedOpr);
- xf86SetOperatingState(resVgaMem, pRiva->pEnt->index, ResDisableOpr);
-+#endif
-
- /* Set pScrn->monitor */
- pScrn->monitor = pScrn->confScreen->monitor;
-@@ -633,6 +635,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
- xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
- (unsigned long)pRiva->IOAddress);
-
-+#ifndef XSERVER_LIBPCIACCESS
- if (xf86RegisterResources(pRiva->pEnt->index, NULL, ResExclusive)) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "xf86RegisterResources() found resource conflicts\n");
-@@ -640,7 +643,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
- RivaFreeRec(pScrn);
- return FALSE;
- }
--
-+#endif
- Riva3Setup(pScrn);
-
- /*
-diff --git a/src/riva_include.h b/src/riva_include.h
-index 6726fcc..a2064e1 100644
---- a/src/riva_include.h
-+++ b/src/riva_include.h
-@@ -6,7 +6,11 @@
- /* All drivers should typically include these */
- #include "xf86.h"
- #include "xf86_OSproc.h"
-+
-+#ifndef XSERVER_LIBPCIACCESS
- #include "xf86Resources.h"
-+#include "xf86RAC.h"
-+#endif
- #include "compiler.h"
-
- /* Drivers for PCI hardware need this */
-@@ -27,7 +31,6 @@
-
- #include "vbe.h"
-
--#include "xf86RAC.h"
-
- #include "riva_const.h"
-
-diff --git a/src/riva_type.h b/src/riva_type.h
-index 5a1317f..456f813 100644
---- a/src/riva_type.h
-+++ b/src/riva_type.h
-@@ -56,8 +56,8 @@ typedef struct {
- #else
- pciVideoPtr PciInfo;
- PCITAG PciTag;
--#endif
- xf86AccessRec Access;
-+#endif
- int ChipRev;
- Bool Primary;
- CARD32 IOAddress;
---
-cgit v0.8.2
-
diff --git a/source/x11/xf86-video-nv/FrugalBuild
b/source/x11/xf86-video-nv/FrugalBuild
index 080122c..0def1f7 100644
--- a/source/x11/xf86-video-nv/FrugalBuild
+++ b/source/x11/xf86-video-nv/FrugalBuild
@@ -2,8 +2,8 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>
pkgname=xf86-video-nv
-pkgver=2.1.14
-pkgrel=2
+pkgver=2.1.15
+pkgrel=1
pkgdesc="X.Org driver for NVidia cards"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-drivers')
@@ -11,17 +11,6 @@ archs=('i686' 'x86_64' 'ppc')
depends=('xorg-server>=1.6.3')
makedepends=('randrproto>1.3.0' 'renderproto' 'videoproto>=2.2.2'
'xf86dgaproto' 'util-macros')
Finclude xorg
-source=($source xextproto71.diff FixRessources.diff)
-sha1sums=('eda0e94c7a86c7cbc51a9a5de79e71813f28d045' \
- 'c299127191290c5aaf8a44b5e8fd6b03bc5c4d2b' \
- '5a53451416396492ca13728af9ae7bb5b01610c6')
-
-build() {
- Fcd
- Fpatchall
- Fautoreconf
- Fmake
- Fmakeinstall
-}
+sha1sums=('9fbf5298c7cbc49c76e4984aef2347a235b06133')
# optimization OK
diff --git a/source/x11/xf86-video-nv/xextproto71.diff
b/source/x11/xf86-video-nv/xextproto71.diff
deleted file mode 100644
index 6adae1c..0000000
--- a/source/x11/xf86-video-nv/xextproto71.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-From 957b8c1a240884b26ee5b91856c251622cc0b2a7 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutte...@who-t.net>
-Date: Thu, 16 Jul 2009 01:49:24 +0000
-Subject: Update to xextproto 7.1 support.
-
-DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
-need to include dpmsconst.h if xextproto 7.1 is available.
-
-Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index 3c874fe..839512b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,6 +66,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto
$REQUIRED_MODULES])
-+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1,
[xextproto 7.1 available]),
-+ HAVE_XEXTPROTO_71="no")
-+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
- # Checks for libraries.
-diff --git a/src/g80_dac.c b/src/g80_dac.c
-index 404f178..307e412 100644
---- a/src/g80_dac.c
-+++ b/src/g80_dac.c
-@@ -27,8 +27,13 @@
-
- #include <unistd.h>
-
-+#ifdef HAVE_XEXTPROTO_71
-+#include <X11/extensions/dpmsconst.h>
-+#else
- #define DPMS_SERVER
- #include <X11/extensions/dpms.h>
-+#endif
-+
- #include <xf86_OSproc.h>
-
- #include "g80_type.h"
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index 5ecf895..7e06358 100644
---- a/src/g80_driver.c
-+++ b/src/g80_driver.c
-@@ -36,8 +36,13 @@
- #include <micmap.h>
- #include <xf86cmap.h>
- #include <fb.h>
-+#ifdef HAVE_XEXTPROTO_71
-+#include <X11/extensions/dpmsconst.h>
-+#else
- #define DPMS_SERVER
- #include <X11/extensions/dpms.h>
-+#endif
-+
-
- #include "nv_const.h"
- #include "g80_type.h"
-diff --git a/src/g80_sor.c b/src/g80_sor.c
-index c1ef42d..185761f 100644
---- a/src/g80_sor.c
-+++ b/src/g80_sor.c
-@@ -25,8 +25,13 @@
- #include "config.h"
- #endif
-
-+#ifdef HAVE_XEXTPROTO_71
-+#include <X11/extensions/dpmsconst.h>
-+#else
- #define DPMS_SERVER
- #include <X11/extensions/dpms.h>
-+#endif
-+
- #include <X11/Xatom.h>
-
- #include "g80_type.h"
---
-cgit v0.8.2
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
