Drop stale patches.

(Portage version: 2.2_rc51/cvs/Linux x86_64)

3 files changed, 6 insertions, 103 deletions

diff --git a/media-libs/glide-v3/ChangeLog b/media-libs/glide-v3/ChangeLog
index f96382ad04d1..62547c7b95a3 100644
--- a/media-libs/glide-v3/ChangeLog
+++ b/media-libs/glide-v3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/glide-v3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.33 2009/07/28 15:41:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.34 2009/11/22 23:43:17 scarabeus Exp $
+
+  22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/glide-v3-3.10-2.6-headers-fix.patch,
+  -files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch:
+  Drop stale patches.
 
   28 Jul 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   x11-drivers -> x11.
diff --git a/media-libs/glide-v3/files/glide-v3-3.10-2.6-headers-fix.patch b/media-libs/glide-v3/files/glide-v3-3.10-2.6-headers-fix.patch
deleted file mode 100644
index 9b6ab3fcd6a5..000000000000
--- a/media-libs/glide-v3/files/glide-v3-3.10-2.6-headers-fix.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- swlibs/newpci/pcilib/fxlinux.c.orig	2004-06-24 15:00:06.485686968 +0100
-+++ swlibs/newpci/pcilib/fxlinux.c	2004-06-24 15:19:57.414638248 +0100
-@@ -129,7 +129,7 @@
-   default:
-     return 0;
-   }
--  if (ioctl(linuxDevFd, _IOR('3', 3, sizeof(struct pioData)), &desc)==-1)
-+  if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1)
-     return 0;
-   switch (size) {
-   case 1:
-@@ -153,7 +153,7 @@
-   desc.size=size;
-   desc.device=device;
-   desc.value=&data;
--  if (ioctl(linuxDevFd, _IOW('3', 4, sizeof(struct pioData)), &desc)==-1)
-+  if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1)
-     return FXFALSE;
-   return FXTRUE;
- }
-@@ -253,7 +253,7 @@
-   desc.size=sizeof(tmp);
-   desc.value=&tmp;
-   /* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */
--  ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);
-+  ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
-   /* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */
-   return tmp;
- }
-@@ -273,7 +273,7 @@
-   desc.size=sizeof(tmp);
-   desc.value=&tmp;
-   /* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */
--  ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);
-+  ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
-   /* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */
-   return tmp;
- }
-@@ -293,7 +293,7 @@
-   desc.size=sizeof(tmp);
-   desc.value=&tmp;
-   /* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */
--  ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);
-+  ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
-   /* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */
-   return tmp;
- }
-@@ -311,7 +311,7 @@
-   desc.port=port;
-   desc.size=sizeof(data);
-   desc.value=&data;
--  return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;
-+  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
- }
- 
- static FxBool 
-@@ -327,7 +327,7 @@
-   desc.port=port;
-   desc.size=sizeof(data);
-   desc.value=&data;
--  return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;
-+  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
- }
- 
- static FxBool 
-@@ -343,7 +343,7 @@
-   desc.port=port;
-   desc.size=sizeof(data);
-   desc.value=&data;
--  return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;
-+  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
- }
- 
- static FxBool
-
diff --git a/media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch b/media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch
deleted file mode 100644
index 27c30bb03a82..000000000000
--- a/media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- glide3x/h3/minihwc/linhwc.c       2005-12-05 12:07:40.000000000 -0800
-+++ glide3x/h3/minihwc/linhwc.c    2005-12-05 12:08:15.000000000 -0800
-@@ -290,6 +290,9 @@
-   return FXTRUE;
- }
-
-+static FxU32
-+hwcBufferLfbAddr(const hwcBoardInfo *bInfo, FxU32 physAddress);
-+
- FxBool
- hwcAllocBuffers(hwcBoardInfo *bInfo, FxU32 nColBuffers, FxU32 nAuxBuffers)
- {
---- glide3x/h3/glide3/src/xdraw2.inc.S	2005-12-05 12:24:16.000000000 -0800
-+++ glide3x/h3/glide3/src/xdraw2.inc.S	2005-12-05 12:26:01.000000000 -0800
-@@ -812,9 +812,12 @@
- #define packCol %edi
- #define tempVal %edi
- 
-+.ifndef GR_FIFO_WRITE_DEFINED
- .macro GR_FIFO_WRITE __addr __offset __data
- 	mov \__data , \__offset(\__addr)
- .endm	/*  GR_FIFO_WRITE */
-+.equ GR_FIFO_WRITE_DEFINED, 1
-+.endif
- 
- .align 4
- LOCAL(__triBegin):