rpms/Glide3/devel Glide3-amd3dnow.patch, 1.1, 1.2 Glide3.spec, 1.3, 1.4

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon May 2 13:51:49 UTC 2005


Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7688

Modified Files:
	Glide3-amd3dnow.patch Glide3.spec 
Log Message:
- Fix amd3dnow code for cvg(voodoo2) so that it not only compiles but
  also links. Still untested, so still disabled.


Glide3-amd3dnow.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 Glide3-amd3dnow.patch
Index: Glide3-amd3dnow.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-amd3dnow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-amd3dnow.patch	1 May 2005 16:20:02 -0000	1.1
+++ Glide3-amd3dnow.patch	2 May 2005 13:51:46 -0000	1.2
@@ -1,33 +1,5 @@
---- Glide3/h3/glide3/src/xdraw2.inc.S.amd3dnow	2000-10-20 21:07:00.000000000 +0200
-+++ Glide3/h3/glide3/src/xdraw2.inc.S	2005-05-01 13:57:55.437237488 +0200
-@@ -246,7 +246,11 @@
- 	push %edi	/*  save caller's register variable */
- 	push %esi	/*  save caller's register variable  */
- 
-+#ifdef PIC
-+	mov _gc-8(%esp) , gc	/*  gc on stack (NOT!!! in edx) from caller */
-+#else
- 	mov %edx , gc	/*  gc in edx from caller */
-+#endif
- 	push %ebx	/*  save caller's register variable */
- 
- 	push %ebp	/*  save frame pointer */
---- Glide3/h5/glide3/src/xdraw2.inc.s.amd3dnow	2000-11-17 22:31:06.000000000 +0100
-+++ Glide3/h5/glide3/src/xdraw2.inc.s	2005-05-01 13:57:55.438237336 +0200
-@@ -295,7 +295,11 @@
- 	push %edi	/*  save caller's register variable */
- 	push %esi	/*  save caller's register variable  */
- 
-+#ifdef PIC
-+	mov _gc-8(%esp) , gc	/*  gc on stack (NOT!!! in edx) from caller */
-+#else
- 	mov %edx , gc	/*  gc in edx from caller */
-+#endif
- 	push %ebx	/*  save caller's register variable */
- 
- 	push %ebp	/*  save frame pointer */
 --- Glide3/cvg/glide3/src/xtexdl.S.amd3dnow	1999-12-07 22:42:38.000000000 +0100
-+++ Glide3/cvg/glide3/src/xtexdl.S	2005-05-01 13:57:55.439237184 +0200
++++ Glide3/cvg/glide3/src/xtexdl.S	2005-05-02 15:02:40.000000000 +0200
 @@ -46,12 +46,12 @@
  
  /*  Arguments (STKOFF = 12 from 3 dword pushes) */
@@ -47,7 +19,20 @@
  
  /*  NB: The first set of registers (eax-edx) are volatile across */
  /*  function calls. The remaining registers are supposedly non-volatile */
-@@ -93,46 +93,46 @@
+@@ -80,9 +80,9 @@
+ .align 32
+ 
+ #ifdef GL_AMD3D	
+-.globl __grTexDownload_3DNow_MMX
+-.type __grTexDownload_3DNow_MMX, at function
+-__grTexDownload_3DNow_MMX:
++.globl _grTexDownload_3DNow_MMX
++.type _grTexDownload_3DNow_MMX, at function
++_grTexDownload_3DNow_MMX:
+ 
+ /*  Function prologue type things */
+ /*  NB:   We are not bothering to preserve the contents */
+@@ -93,94 +93,94 @@
  /*  because we don't use or call anything that uses fp. */
  	femms 
  
@@ -97,17 +82,26 @@
 +	mov fifoRoom(gc) , temp2	/*  temp2 = gc->fifoRoom */
 +	mov temp1 , _maxT(%esp)	/*  Write back converted field format size */
  
- 	jz .L__grTexDownload_3DNow_MMX___loopT
+-	jz .L__grTexDownload_3DNow_MMX___loopT
++	jz .L_grTexDownload_3DNow_MMX___loopT
  
  /*  Check to make sure there's room in the fifo. If not then */
  /*  we'll wrap and then it should be aligned for the remainder of */
  /*  this function invocation. */
 -	cmp $0x4 , %temp2
+-	jg .L__grTexDownload_3DNow_MMX___mmxAlignFifo
 +	cmp $0x4 , temp2
- 	jg .L__grTexDownload_3DNow_MMX___mmxAlignFifo
++	jg .L_grTexDownload_3DNow_MMX___mmxAlignFifo
  
  	push __LINE__	/*  Line # inside this function */
-@@ -146,40 +146,40 @@
+ 	push $0x0	/*  NULL file name */
+ 
+ 	push $0x4	/*  fifo space required */
+-	call __FifoMakeRoom	/*  Get fifo room */
++	call _FifoMakeRoom	/*  Get fifo room */
+ 
+ /*  Calling out to external code means that our registers can get */
+ /*  trashed in the same way that we trash things. Plus we need to */
  /*  re-cache the fifoPtr since we may have wrapped. */
  
  	add $12 , %esp	/*  Pop the 3 DWORDs for the fifoWrap parameters */
@@ -119,10 +113,12 @@
  	test $0x4 , fifo
  
 -	mov fifoRoom(gc) , %temp2
+-	jz .L__grTexDownload_3DNow_MMX___loopT
 +	mov fifoRoom(gc) , temp2
- 	jz .L__grTexDownload_3DNow_MMX___loopT
++	jz .L_grTexDownload_3DNow_MMX___loopT
  
- .L__grTexDownload_3DNow_MMX___mmxAlignFifo:
+-.L__grTexDownload_3DNow_MMX___mmxAlignFifo:
++.L_grTexDownload_3DNow_MMX___mmxAlignFifo:
  	add $0x4 , fifo	/*  packetPtr++ */
 -	xor %temp1 , %temp1	/*  Clear the nop packet */
 +	xor temp1 , temp1	/*  Clear the nop packet */
@@ -137,7 +133,8 @@
 +	GR_FIFO_WRITE(fifo , -4 , temp1)	/*  NOP packet(0) */
  
  .align 4
- .L__grTexDownload_3DNow_MMX___loopT:
+-.L__grTexDownload_3DNow_MMX___loopT:
++.L_grTexDownload_3DNow_MMX___loopT:
  /*  Check for room to write the current texture scanline     */
 -	mov _maxS$(%esp) , %temp1	/*  temp1 = width of scanline (bytes) */
 -	mov fifoRoom(gc) , %temp2	/*  temp2 = gc->fifoRoom (bytes) */
@@ -149,17 +146,20 @@
 +	add $0x0C , temp1	/*  scanline width + sizeof(packet hdr) (bytes) + nop packet to mmx align */
 +	cmp temp1 , temp2	/*  fifo space required >= space availible ? */
  
- 	jge __dlBegin	/*  Yes, start download now w/ no more checking */
+-	jge __dlBegin	/*  Yes, start download now w/ no more checking */
++	jge .L_grTexDownload_3DNow_MMX___dlBegin	/*  Yes, start download now w/ no more checking */
  
  	push __LINE__	/*  Line # inside this function */
  	push $0x0	/*  NULL file name */
  
 -	push %temp1	/*  fifo space required */
+-	call __FifoMakeRoom	/*  Get fifo room */
 +	push temp1	/*  fifo space required */
- 	call __FifoMakeRoom	/*  Get fifo room */
++	call _FifoMakeRoom	/*  Get fifo room */
  
  	add $12 , %esp	/*  Pop the 3 DWORDs for the fifoWrap parameters */
-@@ -188,7 +188,7 @@
+ 	nop 
+@@ -188,55 +188,55 @@
  /*  Calling out to external code means that our registers can get */
  /*  trashed in the same way that we trash things. Plus we need to */
  /*  re-cache the fifoPtr since we may have wrapped. */
@@ -168,7 +168,35 @@
  	mov fifoPtr(gc) , fifo
  
  #ifdef GLIDE_DEBUG
-@@ -219,20 +219,20 @@
+ /*  Make sure that we have an mmx happy aligned fifoPtr */
+ 	test $4 , fifo
+-	jz .L__grTexDownload_3DNow_MMX
++	jz .L_grTexDownload_3DNow_MMX
+ 
+ /*  Fault right away because this would be a huge suck */
+ 	xor %eax , %eax
+ 	mov %eax , (%eax)
+-.L__grTexDownload_3DNow_MMX:
++.L_grTexDownload_3DNow_MMX:
+ #endif	/*  GLIDE_DEBUG     */
+ 
+ .align 4
+-.L__grTexDownload_3DNow_MMX___dlBegin:
++.L_grTexDownload_3DNow_MMX___dlBegin:
+ 
+ #ifdef GLIDE_DEBUG
+ /*  Make sure that we have an mmx happy aligned fifoPtr */
+ 	test $4 , fifo
+-	jz .L__grTexDownload_3DNow_MMX_2
++	jz .L_grTexDownload_3DNow_MMX_2
+ 
+ /*  Fault right away because this would be a huge suck */
+ 	xor %eax , %eax
+ 	mov %eax , (%eax)
+-.L__grTexDownload_3DNow_MMX_2:
++.L_grTexDownload_3DNow_MMX_2:
+ #endif	/*  GLIDE_DEBUG */
+ 
  /*  Compute packet header words */
  /* 	hdr1: downloadSpace[31:30] numWords[21:3] packetType[2:0] */
  /*   hdr2: download address[29:0] */
@@ -195,9 +223,17 @@
  
  .align 4
  /*  S coordinate inner loop unrolled for 8 texels a write */
-@@ -246,20 +246,20 @@
+-.L__grTexDownload_3DNow_MMX___loopS:
++.L_grTexDownload_3DNow_MMX___loopS:
+ 	movq (dataPtr) , %mm0	/*  load (mmx) 64 bit data (8 texels) */
+ 	add $0x8 , fifo	/*  pre-increment fifoPtr += 2 * sizeof(FxU32) */
+ 
+@@ -244,25 +244,25 @@
+ 	sub $0x8 , curS	/*  curS -= 2 * sizeof(FxU32) */
+ 
  	movq %mm0 , -8(fifo)	/*  *fifoPtr = texelData[64 bits] */
- 	jnz .L__grTexDownload_3DNow_MMX___loopS	/*  if curS > 0 */
+-	jnz .L__grTexDownload_3DNow_MMX___loopS	/*  if curS > 0 */
++	jnz .L_grTexDownload_3DNow_MMX___loopS	/*  if curS > 0 */
  
 -	mov _gc$(%esp) , gc	/*  Re-cache gc which was trashed in the dl loop */
[...2371 lines suppressed...]
++	jge .L_grDrawTriangles_3DNow_$clip_tri_begin_D	/*  yup, start writing triangle data */
+ 
+ 	push $__LINE__	/*  line number inside this function */
+ 	push $0x0	/*  pointer to function name = NULL */
+@@ -3501,7 +3501,7 @@
+ 	add $12 , %esp	/*  remove 3 DWORD arguments from stack */
+ 	nop 	/*  filler */
+ 
+-.L__grDrawTriangles_3DNow_$clip_tri_begin_D:
++.L_grDrawTriangles_3DNow_$clip_tri_begin_D:
+ 
+ 	mov vertexCount , %edx	/*  number of vertices in triangles */
+ 	mov fifoPtr(gc) , fifo	/*  get fifoPtr */
+@@ -3515,7 +3515,7 @@
+ 	test %ebp , fifo	/*  fifoPtr QWORD aligned ? */
+ 
+ 	mov wInfo_offset(gc) , %eax	/*  gc->state.vData.wInfo.offset */
+-	jz .L__grDrawTriangles_3DNow_$clip_fifo_aligned_D	/*  yup */
++	jz .L_grDrawTriangles_3DNow_$clip_fifo_aligned_D	/*  yup */
+ 
+ 	mov %edx , (fifo)	/*  PCI write packet type */
+ 	add $4 , fifo	/*  fifo pointer now QWORD aligned */
+@@ -3575,7 +3575,7 @@
+ 	movq %mm7 , -8(fifo)	/*  PCI write transformed x, y write buffer=mm7 empty */
+ 
+ 	movq %mm4 , (atab+20)	/*  atable[6] = oow * gc->state.tmu_config[1].t_scale | atable[5] = oow * gc->state.tmu_config[1].s_scale */
+-	jne .L__grDrawTriangles_3DNow_$not_pargb_WB0_D	/*  nope, gc->state.vData.colorType != GR_U8 */
++	jne .L_grDrawTriangles_3DNow_$not_pargb_WB0_D	/*  nope, gc->state.vData.colorType != GR_U8 */
+ 
+ 	movd (%edx,%eax) , %mm7	/*  get packed ARGB data 1 DWORD in "write buffer"=mm7 */
+ 	nop 	/*  filler */
+@@ -3583,10 +3583,10 @@
+ 	mov tsuDataList+4(gc) , %eax	/*  get offset of next vertex component (after pargb) */
+ 	add $4 , dataElem	/*  dataElem = 1 (namely pargb) */
+ 
+-.L__grDrawTriangles_3DNow_$not_pargb_WB1_D:
++.L_grDrawTriangles_3DNow_$not_pargb_WB1_D:
+ 
+ 	test %eax , %eax	/*  end of offset list ? */
+-	jz .L__grDrawTriangles_3DNow_$clip_setup_end_WB1_D	/*  yup */
++	jz .L_grDrawTriangles_3DNow_$clip_setup_end_WB1_D	/*  yup */
+ 
+ /*  here:  eax = offset into vertex */
+ /*         ebx = vertexPtr */
+@@ -3599,7 +3599,7 @@
+ /*         mm7 = write buffer */
+ /*  avail: eax, esi, mm0, mm3, mm4, mm5, mm6 */
+ 
+-.L__grDrawTriangles_3DNow_$inner_loop_WB1_D:
++.L_grDrawTriangles_3DNow_$inner_loop_WB1_D:
+ 	mov tsuDatLstScal(gc,dataElem) , %esi	/*  iscaler */
+ 	add $8 , fifo	/*  fifoPtr += 2*sizeof(FxFloat) */
+ 
+@@ -3618,7 +3618,7 @@
+ 	mov tsuDatLstScal+4(gc,dataElem) , %esi	/*  next iscaler */
+ 	movq %mm7 , -8(fifo)	/*  PCI write  new param | previous param */
+ 
+-	jz .L__grDrawTriangles_3DNow_$clip_setup_end_WB0_D	/*  yup, end of offset list, this vertex done */
++	jz .L_grDrawTriangles_3DNow_$clip_setup_end_WB0_D	/*  yup, end of offset list, this vertex done */
+ 	movd (%edx,%eax) , %mm7	/*  TRI_SETF(FARRAY(vPtr, i) */
+ 
+ 	add $8 , dataElem	/*  dataElem += 2 */
+@@ -3636,7 +3636,7 @@
+ 	jnz $inner_loop_WB1_D	/*  nope, get next component (1 DWORD in "write buffer") */
+ 	nop 	/*  filler */
+ 
+-.L__grDrawTriangles_3DNow_$clip_setup_end_WB1_D:
++.L_grDrawTriangles_3DNow_$clip_setup_end_WB1_D:
+ 	mov (vertices) , vertexCount	/*  get back number of vertices left to process */
+ 	mov wInfo_offset(gc) , %eax	/*  gc->state.vData.wInfo.offset */
+ 
+@@ -3646,14 +3646,14 @@
+ 	movd %mm7 , (fifo)	/*  flush "write buffer" */
+ 	add $4 , fifo	/*  fifoPtr += sizeof(FxFloat) */
+ 
+-	jmp .L__grDrawTriangles_3DNow_$clip_setup_done_D	/*  all vertices handled, triangles done */
++	jmp .L_grDrawTriangles_3DNow_$clip_setup_done_D	/*  all vertices handled, triangles done */
+ 	nop 	/*  filler */
+ 
+-.L__grDrawTriangles_3DNow_$clip_fifo_aligned_D:
++.L_grDrawTriangles_3DNow_$clip_fifo_aligned_D:
+ 
+ 	movd %edx , %mm7	/*  write buffer has 1 DWORD now */
+ 
+-.L__grDrawTriangles_3DNow_$clip_for_begin_WB1_D:
++.L_grDrawTriangles_3DNow_$clip_for_begin_WB1_D:
+ 
+ /*  here:  eax = gc->state.vData.wInfo.offset */
+ /*         ebx = vertexPtr */
+@@ -3714,7 +3714,7 @@
+ 	nop 	/*  filler */
+ 
+ 	movq %mm3 , (atab+20)	/*  atable[6] = oow * gc->state.tmu_config[1].t_scale | atable[5] = oow * gc->state.tmu_config[1].s_scale */
+-	jne .L__grDrawTriangles_3DNow_$not_pargb_WB1_D	/*  nope, gc->state.vData.colorType != GR_U8 */
++	jne .L_grDrawTriangles_3DNow_$not_pargb_WB1_D	/*  nope, gc->state.vData.colorType != GR_U8 */
+ 
+ 	movd (%edx,%eax) , %mm6	/*  get packed ARGB data */
+ 	mov $4 , dataElem	/*  dataElem = 1 (namely pargb) */
+@@ -3725,9 +3725,9 @@
+ 	movq %mm7 , (fifo)	/*  PCI write pargb | transformed y */
+ 	add $8 , fifo	/*  fifoPtr += 2*sizeof(FxFloat) */
+ 
+-.L__grDrawTriangles_3DNow_$not_pargb_WB0_D:
++.L_grDrawTriangles_3DNow_$not_pargb_WB0_D:
+ 	test %eax , %eax	/*  end of data offset list ? */
+-	jz .L__grDrawTriangles_3DNow_$clip_setup_end_WB0_D	/*  yup, this vertex done */
++	jz .L_grDrawTriangles_3DNow_$clip_setup_end_WB0_D	/*  yup, this vertex done */
+ 
+ /*  here:  eax = offset into vertex */
+ /*         ebx = vertexPtr */
+@@ -3739,7 +3739,7 @@
+ /*         mm2 = gc->state.Viewport.hheight|gc->state.Viewport.hwidth */
+ /*  avail: eax, esi, mm0, mm3, mm4, mm5, mm6, mm7 */
+ 
+-.L__grDrawTriangles_3DNow_$inner_loop_WB0_D:
++.L_grDrawTriangles_3DNow_$inner_loop_WB0_D:
+ 	mov tsuDatLstScal(gc,dataElem) , %esi	/*  iscaler */
+ 	movd (%edx,%eax) , %mm7	/*  TRI_SETF(FARRAY(vPtr, i) */
+ 
+@@ -3753,7 +3753,7 @@
+ 	mov tsuDatLstScal+4(gc,dataElem) , %esi	/*  next iscaler */
+ 
+ 	test %eax , %eax	/*  offset == 0 (end of offset list) ? */
+-	jz .L__grDrawTriangles_3DNow_$clip_setup_end_WB1_D	/*  yup, vertex done, 1 DWORD in "write buffer" */
++	jz .L_grDrawTriangles_3DNow_$clip_setup_end_WB1_D	/*  yup, vertex done, 1 DWORD in "write buffer" */
+ 
+ 	movd (%edx,%eax) , %mm4	/*  TRI_SETF(FARRAY(vPtr, i) */
+ 	movd 4(%esi) , %mm6	/*  atable[iscaler] */
+@@ -3773,14 +3773,14 @@
+ 	movq %mm7 , -8(fifo)	/*  PCI write current component | previous component */
+ 	jnz $inner_loop_WB0_D	/*  nope, vertex not done yet "write buffer" empty */
+ 
+-.L__grDrawTriangles_3DNow_$clip_setup_end_WB0_D:
++.L_grDrawTriangles_3DNow_$clip_setup_end_WB0_D:
+ 	mov (vertices) , vertexCount	/*  get back number of vertices left to process */
+ 	mov wInfo_offset(gc) , %eax	/*  gc->state.vData.wInfo.offset */
+ 
+ 	dec vertexCount	/*  one less vertex to process, any left? */
+ 	jnz $clip_for_begin_WB0_D	/*  yup, vertices left, push out next vertex */
+ 
+-.L__grDrawTriangles_3DNow_$clip_setup_done_D:
++.L_grDrawTriangles_3DNow_$clip_setup_done_D:
+ 	mov fifoPtr(gc) , %eax	/*  old fifoPtr */
+ 	mov fifoRoom(gc) , %ebp	/*  old number of bytes available in fifo */
+ 
+@@ -3797,13 +3797,13 @@
+ 	mov vertexCount , _count(%esp)	/*  remaining number of vertices to process  */
+ 
+ 	cmp $0 , vertexCount	/*  any vertices left to process */
+-	jg .L__grDrawTriangles_3DNow_$clip_coords_begin_D	/*  loop if number of vertices to process >= 0 */
++	jg .L_grDrawTriangles_3DNow_$clip_coords_begin_D	/*  loop if number of vertices to process >= 0 */
+ 
+ 	femms 	/*  no more MMX code clear MMX/FPU state */
+ 
+ #endif	/*  GLIDE3_SCALER */
+ 
+-.L__grDrawTriangles_3DNow_$tris_done:
++.L_grDrawTriangles_3DNow_$tris_done:
+ 	pop %ebp	/*  restore frame pointer */
+ 	pop %ebx	/*  restore caller's register variable */
+ 
+@@ -3811,8 +3811,8 @@
+ 	pop %edi	/*  restore caller's register variable */
+ 
+ 	ret	/*  return, pop 3 DWORD parameters */
+-.L_END___grDrawTriangles_3DNow:
+-.size __grDrawTriangles_3DNow,.L_END___grDrawTriangles_3DNow-__grDrawTriangles_3DNow
++.L_END__grDrawTriangles_3DNow:
++.size _grDrawTriangles_3DNow,.L_END__grDrawTriangles_3DNow-_grDrawTriangles_3DNow
+ 
+ 
+ /* -------------------------------------------------------------------------- */
+--- Glide3/h3/glide3/src/xdraw2.inc.S.amd3dnow	2000-10-20 21:07:00.000000000 +0200
++++ Glide3/h3/glide3/src/xdraw2.inc.S	2005-05-02 15:02:40.000000000 +0200
+@@ -246,7 +246,11 @@
+ 	push %edi	/*  save caller's register variable */
+ 	push %esi	/*  save caller's register variable  */
+ 
++#ifdef PIC
++	mov _gc-8(%esp) , gc	/*  gc on stack (NOT!!! in edx) from caller */
++#else
+ 	mov %edx , gc	/*  gc in edx from caller */
++#endif
+ 	push %ebx	/*  save caller's register variable */
+ 
+ 	push %ebp	/*  save frame pointer */
+--- Glide3/h5/glide3/src/xdraw2.inc.s.amd3dnow	2000-11-17 22:31:06.000000000 +0100
++++ Glide3/h5/glide3/src/xdraw2.inc.s	2005-05-02 15:02:40.000000000 +0200
+@@ -295,7 +295,11 @@
+ 	push %edi	/*  save caller's register variable */
+ 	push %esi	/*  save caller's register variable  */
+ 
++#ifdef PIC
++	mov _gc-8(%esp) , gc	/*  gc on stack (NOT!!! in edx) from caller */
++#else
+ 	mov %edx , gc	/*  gc in edx from caller */
++#endif
+ 	push %ebx	/*  save caller's register variable */
+ 
+ 	push %ebp	/*  save frame pointer */


Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Glide3.spec	1 May 2005 16:20:02 -0000	1.3
+++ Glide3.spec	2 May 2005 13:51:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:    Glide3
 Version: 20010520
-Release: 35.1
+Release: 35
 Summary: Glide runtime for the 3Dfx Voodoo family of cards
 # Glide3 is x86/alpha/ia64/x86_64 only, ia64 and x86_64 are untested
 ExclusiveArch: %{ix86} alpha ia64 x86_64
@@ -63,19 +63,18 @@
 autoconf
 
 #%ifarch %{ix86}
-#%define enable_amd3d --enable-amd3d
+#%define configure_flags --enable-fx-debug=no --enable-amd3d
 #%else
-%define enable_amd3d
+%define configure_flags --enable-fx-debug=no
 #%endif
 
 mkdir build-5
 cd build-5
 ln -s ../configure configure
 %configure \
-        --enable-fx-debug=no \
+        %{configure_flags} \
         --enable-fx-glide-hw=h5 \
-        --enable-fx-dri-build \
-	%{enable_amd3d}
+        --enable-fx-dri-build
 make -f makefile.autoconf all
 cd ..
 
@@ -83,10 +82,9 @@
 cd build-3
 ln -s ../configure configure
 %configure \
-        --enable-fx-debug=no \
+        %{configure_flags} \
         --enable-fx-glide-hw=h3 \
-        --enable-fx-dri-build \
-	%{enable_amd3d}
+        --enable-fx-dri-build
 make -f makefile.autoconf all
 cd ..
 
@@ -96,9 +94,8 @@
 cd build-2
 ln -s ../configure configure
 %configure \
-        --enable-fx-debug=no \
-        --enable-fx-glide-hw=cvg \
-	%{enable_amd3d}
+        %{configure_flags} \
+        --enable-fx-glide-hw=cvg
 make -f makefile.autoconf all
 cd ..
 %endif
@@ -159,11 +156,15 @@
 
 
 %changelog
+* Mon May  2 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix amd3dnow code for cvg(voodoo2) so that it not only compiles but
+  also links. Still untested, so still disabled.
+
 * Sun May  1 2005 Hans de Goede <j.w.r.degoede at hhs.nl>
 - Added a patch which fixes PIC compilation of amd3dnow asm code
   for h3 and h5 and which fixes compilation of amd3dnow code in general
   for cvg. Currently amd3dnow support is still disabled because it doesn't
-  work on my voodoo2.
+  work on my voodoo2 (linking problem).
 - replaced configure with %%configure
 
 * Sat Apr 30 2005 Hans de Goede <j.w.r.degoede at hhs.nl>




More information about the fedora-extras-commits mailing list