Source: libsdl1.2 Followup-For: Bug #834204 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512
Attached is a patch from Parabola to avoid using the baguely licensed file, to survive a repackaging with it stripped. - Jonas - -- System Information: Debian Release: buster/sid APT prefers buildd-unstable APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.11.0-1-amd64 (SMP w/2 CPU cores) Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE=C.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAlls/YYACgkQLHwxRsGg ASHVjA//ZhhUBmIThagxO9c8uLjHsRi0a9QmWrG11FSn6nkDlUyuAURKLs3FTRCD 5D42XtSf86xfVXcnMY/EACurhWB0zWB+y1h03tIOYHSodfTnMpk0yiTv/i9TkfBL 7jYtezOpehfqV8xVyBR9lye2tqPqpVy2l+INlDmEdutV+MMZk2r7CGETcVcunt8E LsxCJOMmvQmlCt0GN5+7gh3JHJHDEk/36P7Qaj1q/rVSEH6xNm81nIQH8DNca0cB +CFin5WBw9NogS3Gaf9pv6RM6NawXLp/WxE94nf1+0F7Wd78nES5YrH3CycL7ssO vZqlsgKDs2r+tEnWNtNB9g4JakUah/QHBma5gf4ksNiSrKC54oyh9Lb1fnVl0Srm LGrALFvIglpjKpFuyRLUHbucZURac1KN6RiOe2KGAuHLgiJA70IrWWpZC1a0eF/U 1EWk7eCPr+KN5ORasf59Q1yOX36NIsGL3mzwXW4uiEcM0GCjHKXl6/RaLxTJnCNQ 13t2fWHI1JLxn/szHG79X9LFvRIqftl8M/+a+eWWdgSHBWzbUm5rcuuFyjCeoAQR IPAeItMRON/iBUQMeb3pmxhwbEKeLJ9DDpsPml3Yq9YM3RvltEheAnt8QuO40cNI d/x/h7O8sShPuWNbLQDHViy8RqImsaZAEu+hbv3qBBgkvBH+vhY= =dZcH -----END PGP SIGNATURE-----
Description: Avoid maybe non-DFSG file Avoid use of source file with vague licensing terms regarding modification Origin: https://git.parabola.nu/abslibre.git/log/libre/sdl/libre.patch Last-Update: 2017-07-17 Bug-Debian: http://bugs.debian.org/834204 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/src/video/fbcon/SDL_fbriva.c +++ b/src/video/fbcon/SDL_fbriva.c @@ -24,12 +24,10 @@ #include "SDL_video.h" #include "../SDL_blit.h" #include "SDL_fbriva.h" -#include "riva_mmio.h" #include "riva_regs.h" static int FifoEmptyCount = 0; -static int FifoFreeCount = 0; /* Wait for vertical retrace */ static void WaitVBL(_THIS) @@ -41,20 +39,6 @@ while ( !(*port & 0x08) ) ; } -static void NV3WaitIdle(_THIS) -{ - RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); - while ( (Rop->FifoFree < FifoEmptyCount) || - (*(mapped_io + PGRAPH_OFFSET + 0x000006B0) & 0x01) ) - ; -} -static void NV4WaitIdle(_THIS) -{ - RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); - while ( (Rop->FifoFree < FifoEmptyCount) || - (*(mapped_io + PGRAPH_OFFSET + 0x00000700) & 0x01) ) - ; -} #if 0 /* Not yet implemented? */ /* Sets video mem colorkey and accelerated blit function */ @@ -74,7 +58,6 @@ { int dstX, dstY; int dstW, dstH; - RivaBitmap *Bitmap = (RivaBitmap *)(mapped_io + BITMAP_OFFSET); /* Don't blit to the display surface when switched away */ if ( switched_away ) { @@ -93,13 +76,6 @@ dstX += rect->x; dstY += rect->y; - RIVA_FIFO_FREE(Bitmap, 1); - Bitmap->Color1A = color; - - RIVA_FIFO_FREE(Bitmap, 2); - Bitmap->UnclippedRectangle[0].TopLeft = (dstX << 16) | dstY; - Bitmap->UnclippedRectangle[0].WidthHeight = (dstW << 16) | dstH; - FB_AddBusySurface(dst); if ( dst == this->screen ) { @@ -115,7 +91,6 @@ int srcX, srcY; int dstX, dstY; int dstW, dstH; - RivaScreenBlt *Blt = (RivaScreenBlt *)(mapped_io + BLT_OFFSET); /* FIXME: For now, only blit to display surface */ if ( dst->pitch != SDL_VideoSurface->pitch ) { @@ -142,11 +117,6 @@ dstX += dstrect->x; dstY += dstrect->y; - RIVA_FIFO_FREE(Blt, 3); - Blt->TopLeftSrc = (srcY << 16) | srcX; - Blt->TopLeftDst = (dstY << 16) | dstX; - Blt->WidthHeight = (dstH << 16) | dstW; - FB_AddBusySurface(src); FB_AddBusySurface(dst); @@ -185,23 +155,15 @@ void FB_RivaAccel(_THIS, __u32 card) { - RivaRop *Rop = (RivaRop *)(mapped_io + ROP_OFFSET); /* We have hardware accelerated surface functions */ this->CheckHWBlit = CheckHWBlit; wait_vbl = WaitVBL; switch (card) { - case FB_ACCEL_NV3: - wait_idle = NV3WaitIdle; - break; - case FB_ACCEL_NV4: - wait_idle = NV4WaitIdle; - break; default: /* Hmm... FIXME */ break; } - FifoEmptyCount = Rop->FifoFree; /* The Riva has an accelerated color fill */ this->info.blit_fill = 1; --- a/src/video/fbcon/SDL_fbvideo.c +++ b/src/video/fbcon/SDL_fbvideo.c @@ -46,7 +46,6 @@ #include "SDL_fbevents_c.h" #include "SDL_fb3dfx.h" #include "SDL_fbmatrox.h" -#include "SDL_fbriva.h" /*#define FBCON_DEBUG*/ @@ -769,13 +768,6 @@ #endif FB_3DfxAccel(this, finfo.accel); break; - case FB_ACCEL_NV3: - case FB_ACCEL_NV4: -#ifdef FBACCEL_DEBUG - printf("NVidia hardware accelerator!\n"); -#endif - FB_RivaAccel(this, finfo.accel); - break; default: #ifdef FBACCEL_DEBUG printf("Unknown hardware accelerator.\n");
