summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-22 23:45:17 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-22 23:45:17 +0000
commitafcb869d93d51a7f4b3c0b37be9305142ad7c4f0 (patch)
tree7df2595019e93c25021b42cc4028a93597a6bad7 /media-libs
parentold (diff)
downloadhistorical-afcb869d93d51a7f4b3c0b37be9305142ad7c4f0.tar.gz
historical-afcb869d93d51a7f4b3c0b37be9305142ad7c4f0.tar.bz2
historical-afcb869d93d51a7f4b3c0b37be9305142ad7c4f0.zip
Drop stale patches.
Package-Manager: portage-2.2_rc51/cvs/Linux x86_64
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/glide-v3/ChangeLog7
-rw-r--r--media-libs/glide-v3/files/glide-v3-3.10-2.6-headers-fix.patch75
-rw-r--r--media-libs/glide-v3/files/glide-v3-3.10-hwcBufferLfbAddr-conflict.patch27
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/files/6.5.2-i965-wine-fix.patch109
5 files changed, 11 insertions, 213 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):
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index a9be3bc88296..e7976143dc6d 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.238 2009/10/26 20:24:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.239 2009/11/22 23:45:17 scarabeus Exp $
+
+ 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/6.5.2-i965-wine-fix.patch:
+ Drop stale patches.
26 Oct 2009; Jeroen Roovers <jer@gentoo.org> mesa-7.5.1.ebuild:
Stable for HPPA (bug #282290).
diff --git a/media-libs/mesa/files/6.5.2-i965-wine-fix.patch b/media-libs/mesa/files/6.5.2-i965-wine-fix.patch
deleted file mode 100644
index 63acd15806b9..000000000000
--- a/media-libs/mesa/files/6.5.2-i965-wine-fix.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- a/src/mesa/drivers/dri/i965/brw_context.h
-+++ b/src/mesa/drivers/dri/i965/brw_context.h
-@@ -599,6 +599,7 @@ struct brw_context
-
- struct {
- struct brw_wm_prog_data *prog_data;
-+ struct brw_wm_compile *compile_data;
-
- /* Input sizes, calculated from active vertex program:
- */
-diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
-index 3e2f2d0..0f842d2 100644
---- a/src/mesa/drivers/dri/i965/brw_wm.c
-+++ b/src/mesa/drivers/dri/i965/brw_wm.c
-@@ -138,64 +138,75 @@ static void do_wm_prog( struct brw_conte
- struct brw_fragment_program *fp,
- struct brw_wm_prog_key *key)
- {
-- struct brw_wm_compile c;
-+ struct brw_wm_compile *c;
- const GLuint *program;
- GLuint program_size;
-
-- memset(&c, 0, sizeof(c));
-- memcpy(&c.key, key, sizeof(*key));
-+ c = brw->wm.compile_data;
-+ if (c == NULL) {
-+ brw->wm.compile_data = calloc(1, sizeof(*brw->wm.compile_data));
-+ c = brw->wm.compile_data;
-+ } else {
-+ memset(c, 0, sizeof(*brw->wm.compile_data));
-+ }
-+ memcpy(&c->key, key, sizeof(*key));
-
-- c.fp = fp;
-- c.env_param = brw->intel.ctx.FragmentProgram.Parameters;
-+ c->fp = fp;
-+ c->env_param = brw->intel.ctx.FragmentProgram.Parameters;
-
-
- /* Augment fragment program. Add instructions for pre- and
- * post-fragment-program tasks such as interpolation and fogging.
- */
-- brw_wm_pass_fp(&c);
-+ brw_wm_pass_fp(c);
-
- /* Translate to intermediate representation. Build register usage
- * chains.
- */
-- brw_wm_pass0(&c);
-+ brw_wm_pass0(c);
-
- /* Dead code removal.
- */
-- brw_wm_pass1(&c);
-+ brw_wm_pass1(c);
-
- /* Hal optimization
- */
-- brw_wm_pass_hal (&c);
-+ brw_wm_pass_hal (c);
-
- /* Register allocation.
- */
-- c.grf_limit = BRW_WM_MAX_GRF/2;
-+ c->grf_limit = BRW_WM_MAX_GRF/2;
-
- /* This is where we start emitting gen4 code:
- */
-- brw_init_compile(&c.func);
-+ brw_init_compile(&c->func);
-
-- brw_wm_pass2(&c);
-+ brw_wm_pass2(c);
-
-- c.prog_data.total_grf = c.max_wm_grf;
-- c.prog_data.total_scratch = c.last_scratch ? c.last_scratch + 0x40 : 0;
-+ c->prog_data.total_grf = c->max_wm_grf;
-+ if (c->last_scratch) {
-+ c->prog_data.total_scratch =
-+ c->last_scratch + 0x40;
-+ } else {
-+ c->prog_data.total_scratch = 0;
-+ }
-
- /* Emit GEN4 code.
- */
-- brw_wm_emit(&c);
-+ brw_wm_emit(c);
-
- /* get the program
- */
-- program = brw_get_program(&c.func, &program_size);
-+ program = brw_get_program(&c->func, &program_size);
-
- /*
- */
- brw->wm.prog_gs_offset = brw_upload_cache( &brw->cache[BRW_WM_PROG],
-- &c.key,
-- sizeof(c.key),
-+ &c->key,
-+ sizeof(c->key),
- program,
- program_size,
-- &c.prog_data,
-+ &c->prog_data,
- &brw->wm.prog_data );
- }
-