Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=14c7da1a232e0f431d2523731de32c001d25b89e
commit 14c7da1a232e0f431d2523731de32c001d25b89e
Author: bouleetbil <bouleet...@frogdev.info>
Date: Thu Sep 3 13:22:45 2009 +0200
xf86-video-tga-1.2.0-2-i686
*rebuild with new xorg
diff --git a/source/x11/xf86-video-tga/FixRessources.diff
b/source/x11/xf86-video-tga/FixRessources.diff
new file mode 100644
index 0000000..9d4eeb9
--- /dev/null
+++ b/source/x11/xf86-video-tga/FixRessources.diff
@@ -0,0 +1,64 @@
+From 2e5ad88716038229563e0682b2665f156aab0d33 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@redhat.com>
+Date: Tue, 28 Jul 2009 03:32:39 +0000
+Subject: tga: update for resources/RAC API removal
+
+---
+diff --git a/src/tga_driver.c b/src/tga_driver.c
+index 8615b29..069fdc6 100644
+--- a/src/tga_driver.c
++++ b/src/tga_driver.c
+@@ -38,9 +38,10 @@
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+
+-/* RAC stuff */
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86Resources.h"
+-
++#include "xf86RAC.h"
++#endif
+ /* #include "vgaHW.h" */
+
+ /* software cursor */
+@@ -54,9 +55,6 @@
+
+ #include "fb.h"
+
+-/* more RAC stuff */
+-#include "xf86RAC.h"
+-
+ /* Gamma Correction? */
+ #include "xf86cmap.h"
+
+@@ -471,7 +469,9 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
+ /* This is the general case */
+ for (i = 0; i < pScrn->numEntities; i++) {
+ pTga->pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
++#ifndef XSERVER_LIBPCIACCESS
+ if (pTga->pEnt->resources) return FALSE;
++#endif
+ pTga->Chipset = pTga->pEnt->chipset;
+ pScrn->chipset = (char *)xf86TokenToString(TGAChipsets,
+ pTga->pEnt->chipset);
+@@ -765,6 +765,7 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
+ xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX\n",
+ (unsigned long)pTga->IOAddress);
+
++#ifndef XSERVER_LIBPCIACCESS
+ /* RAC stuff: we don't have any resources we need to reserve,
+ but we should do this here anyway */
+ if (xf86RegisterResources(pTga->pEnt->index, NULL, ResExclusive)) {
+@@ -773,8 +774,7 @@ TGAPreInit(ScrnInfoPtr pScrn, int flags)
+ TGAFreeRec(pScrn);
+ return FALSE;
+ }
+-
+-
++#endif
+
+ /* HW bpp matches reported bpp */
+ pTga->HwBpp = pScrn->bitsPerPixel;
+--
+cgit v0.8.2
+
diff --git a/source/x11/xf86-video-tga/FrugalBuild
b/source/x11/xf86-video-tga/FrugalBuild
index a948921..f2bf0f2 100644
--- a/source/x11/xf86-video-tga/FrugalBuild
+++ b/source/x11/xf86-video-tga/FrugalBuild
@@ -3,14 +3,25 @@
pkgname=xf86-video-tga
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org video driver for tga cards"
url="http://xorg.freedesktop.org";
groups=('x11' 'xorg-core' 'xorg-drivers')
archs=('i686' 'x86_64')
-depends=('xorg-server>=1.6.1-2')
-makedepends=('randrproto>1.3.0' 'renderproto' 'xf86dgaproto'
'videoproto>=2.2.2')
+depends=('xorg-server>=1.6.3')
+makedepends=('randrproto>1.3.0' 'renderproto' 'xf86dgaproto' \
+ 'videoproto>=2.2.2' 'util-macros')
Finclude xorg
-sha1sums=('78eec5bb2c688b6c6ddd8e651f02f51881e95b83')
+source=($source Xextproto71.diff FixRessources.diff)
+sha1sums=('78eec5bb2c688b6c6ddd8e651f02f51881e95b83' \
+ '30a15762602c0c697d41d50b01a475c9bae5a018' \
+ '8d2ab35d74b925a6bcfbd28dc5f9356e3232378d')
+
+build() {
+ Fpatchall
+ Fautoreconf
+ Fmake
+ Fmakeinstall
+}
# optimization OK
diff --git a/source/x11/xf86-video-tga/Xextproto71.diff
b/source/x11/xf86-video-tga/Xextproto71.diff
new file mode 100644
index 0000000..1b7252e
--- /dev/null
+++ b/source/x11/xf86-video-tga/Xextproto71.diff
@@ -0,0 +1,46 @@
+From 60a7cad2c07bd23f58de07e927d0abbadd5e3bc8 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Thu, 16 Jul 2009 01:57:07 +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 b47a6d0..3ff2dfb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,6 +56,10 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
+
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 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/tga_driver.c b/src/tga_driver.c
+index c315d2e..8615b29 100644
+--- a/src/tga_driver.c
++++ b/src/tga_driver.c
+@@ -70,8 +70,13 @@
+ #endif
+
+ #include "globals.h"
++#ifdef HAVE_XEXTPROTO_71
++#include <X11/extensions/dpmsconst.h>
++#else
+ #define DPMS_SERVER
+ #include <X11/extensions/dpms.h>
++#endif
++
+
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+--
+cgit v0.8.2
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
