rpms/svgalib/devel svgalib-1.9.21-wip.patch, 1.1, 1.2 svgalib-1.9.22.diff, 1.1, 1.2 svgalib.spec, 1.4, 1.5 svgalib-1.9.21-ppc.patch, 1.1, NONE svgalib-1.9.21-wip2.patch, 1.1, NONE svgalib-1.9.21-wip3.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Aug 16 11:55:33 UTC 2005
Author: jwrdegoede
Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19708
Modified Files:
svgalib-1.9.21-wip.patch svgalib-1.9.22.diff svgalib.spec
Removed Files:
svgalib-1.9.21-ppc.patch svgalib-1.9.21-wip2.patch
svgalib-1.9.21-wip3.patch
Log Message:
Merge with upstream, drop merged patches, fix dark vga modes on radeon
svgalib-1.9.21-wip.patch:
Index: svgalib-1.9.21-wip.patch
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-1.9.21-wip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svgalib-1.9.21-wip.patch 5 Aug 2005 09:37:40 -0000 1.1
+++ svgalib-1.9.21-wip.patch 16 Aug 2005 11:55:30 -0000 1.2
@@ -1,427 +1,196 @@
-Only in svgalib-1.9.21: debugfiles.list
-Only in svgalib-1.9.21: debugsources.list
-Only in svgalib-1.9.21: sharedlib
-diff -urBbw svgalib-1.9.21.orig/src/drivers/fbdev.c svgalib-1.9.21/src/drivers/fbdev.c
---- svgalib-1.9.21.orig/src/drivers/fbdev.c 2005-07-30 15:22:24.000000000 +0200
-+++ svgalib-1.9.21/src/drivers/fbdev.c 2005-07-30 09:16:04.000000000 +0200
-@@ -139,16 +139,18 @@
-
- static void fbdev_setpage(int page)
- {
-- static int oldpage = 0;
--
-- if (page != oldpage)
-+ if (fbdev_vgamode)
-+ {
-+ __svgalib_vga_driverspecs.__svgalib_setpage(page);
-+ }
-+ else
- {
- mmap(BANKED_POINTER,
- __svgalib_banked_mem_size,
- PROT_READ | PROT_WRITE,
- MAP_SHARED | MAP_FIXED,
- fbdev_fd, page << 16);
-- oldpage = page;
-+ fbdev_banked_pointer_emulated = 1;
- }
- }
-
-@@ -239,8 +241,10 @@
- {
- struct fb_var_screeninfo info;
-
-- if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode))
-+ if (IS_IN_STANDARD_VGA_DRIVER(mode))
- {
-+ if (__svgalib_fbdev_novga)
-+ return 1;
- if (__svgalib_vga_driverspecs.setmode(mode, prv_mode))
- return 1;
- if (fbdev_banked_pointer_emulated)
-@@ -288,8 +292,13 @@
- struct fb_var_screeninfo info;
- unsigned g, bpp;
-
-- if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode))
-+ if (IS_IN_STANDARD_VGA_DRIVER(mode))
-+ {
-+ if (__svgalib_fbdev_novga)
-+ return 0;
-+ else
- return __svgalib_vga_driverspecs.modeavailable(mode);
-+ }
-
- if (fbdev_screeninfo(&info, mode))
- return 0;
-@@ -356,7 +365,7 @@
- struct fb_var_screeninfo info;
- int maxpixels = fbdev_memory;
-
-- if (!__svgalib_fbdev_novga && IS_IN_STANDARD_VGA_DRIVER(mode))
-+ if (IS_IN_STANDARD_VGA_DRIVER(mode))
- return __svgalib_vga_driverspecs.getmodeinfo(mode, modeinfo);
-
- if (modeinfo->bytesperpixel)
-Only in svgalib-1.9.21/src/drivers: fbdev.c.wip
-Only in svgalib-1.9.21/src: svgalib_helper.h
-diff -urBbw svgalib-1.9.21.orig/src/vga.c svgalib-1.9.21/src/vga.c
---- svgalib-1.9.21.orig/src/vga.c 2005-07-30 15:22:24.000000000 +0200
-+++ svgalib-1.9.21/src/vga.c 2005-07-30 15:18:46.000000000 +0200
-@@ -471,8 +471,13 @@
- static unsigned long graph_buf_size = 0;
- static unsigned char *graph_buf = NULL; /* saves graphics data during flip */
-
--static unsigned char *font_buf1=NULL; /* saved font data - plane 2 */
--static unsigned char *font_buf2=NULL; /* saved font data - plane 3 */
-+/* The format of the fontdata seems to differ between banked and LFB access,
-+ so we save both in case emulatepage gets set between saving and restoring.
-+ This can happen when using runinbackground in nohelper secure mode. */
-+static unsigned char *font_buf1_banked=NULL; /* saved font data - plane 2 */
-+static unsigned char *font_buf2_banked=NULL; /* saved font data - plane 3 */
-+static unsigned char *font_buf1_linear=NULL; /* saved font data - plane 2 */
-+static unsigned char *font_buf2_linear=NULL; /* saved font data - plane 3 */
- static unsigned char *text_buf1=NULL; /* saved text data - plane 0 */
- static unsigned char *text_buf2=NULL; /* saved text data - plane 1 */
-
-@@ -859,8 +864,49 @@
-
- static void __svgalib_giveup_perm(void)
- {
-- if (CHIPSET != FBDEV)
-+ if (CHIPSET != FBDEV) {
- __svgalib_linear_mem_phys_addr = __svgalib_linear_mem_base;
-+ /* Try get a pure handle to the LFB which can safely be left open
-+ at all times, this will only work with 2.6 kernels.
-+ This could be done in helper mode too, but we don't know the
-+ real pci ID there, only the helper module id. Also this
-+ is not usefull in helpermode since mem_fd must always be left
-+ open in helpermode. */
-+ if (__svgalib_nohelper) {
-+ unsigned int bus, device, fn;
-+ char buf[256];
-+ FILE *f;
-+ int i, fd;
-+
-+ bus=(__svgalib_pci_card_found_at&0xff00)>>8;
-+ device=(__svgalib_pci_card_found_at&0xf8)>>3;
-+ fn=__svgalib_pci_card_found_at&0x07;
-+ snprintf(buf, 256, "/sys/bus/pci/devices/0000:%02u:%02x.%u/resource",
-+ bus, device, fn);
-+
-+ f = fopen(buf, "r");
-+ if (f) {
-+ for (i=0; fgets(buf, 256, f); i++) {
-+ if (strtoul(buf, NULL, 16) == __svgalib_linear_mem_base) {
-+ snprintf(buf, 256,
-+ "/sys/bus/pci/devices/0000:%02u:%02x.%u/resource%i",
-+ bus, device, fn, i);
-+ fd = open(buf, O_RDWR);
-+ if (fd != -1) {
-+ __svgalib_linear_mem_fd = fd;
-+ __svgalib_linear_mem_base = 0;
-+#ifdef DEBUG
-+ fprintf(stderr, "svgalib: debug: Opened: %s as LFB\n",
-+ buf);
-+#endif
-+ }
-+ break;
-+ }
-+ }
-+ fclose(f);
-+ }
-+ }
-+ }
-
- /* mmap graphics memory */
- map_mem();
-@@ -902,7 +948,7 @@
-
- static void slowcpy(unsigned char *dest, unsigned char *src, unsigned bytes)
- {
-- if(dest==NULL || src==NULL || (int)dest==-1 || (int)src==-1) return;
-+ if(dest==NULL || src==NULL || (long)dest==-1L || (long)src==-1L) return;
- while (bytes > 0) {
- *(uint32_t *)dest = *(uint32_t *)src;
- dest+=4;
-@@ -1649,16 +1695,30 @@
- save_text();
-
- /* Allocate space for textmode font. */
-- font_buf1 = malloc(FONT_SIZE * 2);
-- font_buf2 = font_buf1 + FONT_SIZE;
-+ if (!__svgalib_emulatepage)
-+ {
-+ font_buf1_banked = malloc(FONT_SIZE * 2);
-+ font_buf2_banked = font_buf1_banked + FONT_SIZE;
-+ }
-+ if (LINEAR_POINTER)
-+ {
-+ font_buf1_linear = malloc(FONT_SIZE * 2);
-+ font_buf2_linear = font_buf1_linear + FONT_SIZE;
-+ }
-
- /* save font data in plane 2 */
- __svgalib_outgra(0x04,0x02);
-- slowcpy(font_buf1, GM, FONT_SIZE);
-+ if (!__svgalib_emulatepage)
-+ slowcpy(font_buf1_banked, GM, FONT_SIZE);
-+ if (LINEAR_POINTER)
-+ slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE);
-
- /* save font data in plane 3 */
- __svgalib_outgra(0x04,0x03);
-- slowcpy(font_buf2, GM, FONT_SIZE);
-+ if (!__svgalib_emulatepage)
-+ slowcpy(font_buf2_banked, GM, FONT_SIZE);
-+ if (LINEAR_POINTER)
-+ slowcpy(font_buf2_linear, LINEAR_POINTER, FONT_SIZE);
- #endif
- }
- initialized = 1;
-@@ -1907,11 +1967,17 @@
- /* restore font data in plane 2 - necessary for all VGA's */
- __svgalib_outseq(0x02,0x04);
-
-- slowcpy(GM, font_buf1, FONT_SIZE);
-+ if (__svgalib_emulatepage)
-+ slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE);
-+ else
-+ slowcpy(GM, font_buf1_banked, FONT_SIZE);
-
- /* restore font data in plane 3 - necessary for Trident VGA's */
- __svgalib_outseq(0x02,0x08);
-- slowcpy(GM, font_buf2, FONT_SIZE);
-+ if (__svgalib_emulatepage)
-+ slowcpy(LINEAR_POINTER, font_buf2_linear, FONT_SIZE);
-+ else
-+ slowcpy(GM, font_buf2_banked, FONT_SIZE);
- fontloadingcomplete();
- #endif
- /* change register adresses if monochrome text mode */
-@@ -1935,11 +2001,17 @@
- __svgalib_outgra(4,2);
- __svgalib_outgra(5,0);
- __svgalib_outgra(6,0);
-- slowcpy(GM, font_buf1, FONT_SIZE);
-+ if (__svgalib_emulatepage)
-+ slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE);
-+ else
-+ slowcpy(GM, font_buf1_banked, FONT_SIZE);
- __svgalib_outseq(2,2);
- slowcpy(GM, text_buf2, FONT_SIZE);
- __svgalib_outseq(2,1);
-- slowcpy(GM, font_buf1, FONT_SIZE);
-+ if (__svgalib_emulatepage)
-+ slowcpy(LINEAR_POINTER, font_buf1_linear, FONT_SIZE);
-+ else
-+ slowcpy(GM, font_buf1_banked, FONT_SIZE);
- __svgalib_outseq(0,1);
- __svgalib_outseq(2,3);
- __svgalib_outseq(4,3);
-@@ -1993,11 +2065,17 @@
- __svgalib_outgra(4,2);
- __svgalib_outgra(5,0);
- __svgalib_outgra(6,0);
-- slowcpy(font_buf1, GM, FONT_SIZE);
-+ if (__svgalib_emulatepage)
-+ slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE);
-+ else
-+ slowcpy(font_buf1_banked, GM, FONT_SIZE);
- __svgalib_outgra(4,1);
- slowcpy(text_buf2, GM, FONT_SIZE);
- __svgalib_outseq(4,0);
-- slowcpy(font_buf1, GM, FONT_SIZE);
-+ if (__svgalib_emulatepage)
-+ slowcpy(font_buf1_linear, LINEAR_POINTER, FONT_SIZE);
-+ else
-+ slowcpy(font_buf1_banked, GM, FONT_SIZE);
- __svgalib_outseq(0,1);
- __svgalib_outseq(2,3);
- __svgalib_outseq(4,3);
-@@ -2078,7 +2156,7 @@
+--- svgalib-1.9.21/src/vga.c.wip 2005-08-16 13:42:55.000000000 +0200
++++ svgalib-1.9.21/src/vga.c 2005-08-16 13:42:55.000000000 +0200
+@@ -2165,9 +2165,8 @@
mouse_mode = mode;
}
if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) &&
- !(modeinfo->flags & IS_LINEAR)) {
+ !(modeinfo->flags & LINEAR_USE)) {
__svgalib_driverspecs->linear(LINEAR_ENABLE, 0);
- __svgalib_modeinfo_linearset |= IS_LINEAR;
+- __svgalib_modeinfo_linearset |= IS_LINEAR;
}
-@@ -2097,6 +2175,12 @@
- void vga_gettextfont(void *font)
- {
- unsigned int getsize;
-+ unsigned char *font_buf1;
-+
-+ if (__svgalib_emulatepage)
-+ font_buf1 = font_buf1_linear;
-+ else
-+ font_buf1 = font_buf1_banked;
-
- /* robert at debian.org, May, 26th 2002: check for valid font_buf buffer */
- if (!font_buf1) {
-@@ -2115,6 +2199,15 @@
- void vga_puttextfont(void *font)
- {
- unsigned int putsize;
-+ unsigned char *font_buf1, *font_buf2;
-+
-+ if (__svgalib_emulatepage) {
-+ font_buf1 = font_buf1_linear;
-+ font_buf2 = font_buf2_linear;
-+ } else {
-+ font_buf1 = font_buf1_banked;
-+ font_buf2 = font_buf2_banked;
-+ }
-
- /* robert at debian.org, May, 26th 2002: check for valid font_buf buffer */
- if (!font_buf1 || !font_buf2) {
-@@ -2236,7 +2328,7 @@
-
- modeinfo = vga_getmodeinfo(mode);
- if (__svgalib_emulatepage && (mode!=G320x200x256) &&
-- !(modeinfo->flags & (CAPABLE_LINEAR|IS_LINEAR)))
-+ !(modeinfo->flags & (CAPABLE_LINEAR|LINEAR_USE)))
- return 0;
-
- return 1;
-@@ -3603,6 +3695,7 @@
- break;
- #else
- fprintf(stderr,"svgalib: Warning: VESA support not enabled!\n");
-+ break;
- #endif
- case 57: /* Vesa save bitmap */
- #ifdef INCLUDE_VESA_DRIVER
-@@ -3915,21 +4008,51 @@
- __svgalib_come_from_background = va_arg(params, void *);
- break;
- default:
-- if (__svgalib_nohelper && __svgalib_nohelper_secure && stat) {
-+ if ( ( stat && __svgalib_runinbackground) ||
-+ (!stat && !__svgalib_runinbackground) )
-+ break; /* nothing todo */
-+ if (stat) {
-+ if (__svgalib_readpage != __svgalib_writepage) {
-+ fprintf(stderr,
-+ "svgalib: Warning runinbackground does not support seperate\n"
-+ "read- and writepages, ignoring runinbackground request.\n");
-+ break;
-+ }
-+ if (__svgalib_mem_fd == -1) {
-+ vga_modeinfo *modeinfo = vga_getmodeinfo(CM);
-+ /* we don't have /dev/mem available so we can't do runinbackground
-+ with the real banked mem, see if we do have an fd for the LFB
-+ and if it is ok to switch to emulating pages. */
-+ if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || (
-+ ( (modeinfo->flags & CAPABLE_LINEAR) ||
-+ (modeinfo->flags & LINEAR_USE) ) &&
-+ (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) {
-+ /* only do this if we are not already emulating pages */
-+ if (!__svgalib_emulatepage)
-+ {
-+ __svgalib_emulatepage=1;
-+ __svgalib_setrdpage=NULL;
-+ __svgalib_setwrpage=NULL;
-+ if (CM != TEXT) {
-+ (*__svgalib_setpage)(vga_page_offset);
-+ if ((modeinfo->flags & CAPABLE_LINEAR) &&
-+ !(modeinfo->flags & LINEAR_USE)) {
-+ __svgalib_driverspecs->linear(LINEAR_ENABLE, 0);
-+ __svgalib_modeinfo_linearset |= IS_LINEAR;
-+ }
-+ }
-+ map_banked(MAP_FIXED);
-+ }
-+ } else {
- fprintf(stderr,
- "svgalib: Warning runinbackground not supported in nohelper mode, ignoring\n"
- " runinbackground request. Program should check vga_runinbackground_version\n"
- " before calling vga_runinbackground\n");
- break;
- }
-- if (stat && (__svgalib_readpage != __svgalib_writepage)) {
-- fprintf(stderr,
-- "svgalib: Warning runinbackground does not support seperate "
-- "read- and writepages, ignoring\n"
-- " runinbackground request.\n");
-- break;
- }
-- if (!stat)
-+ }
-+ else /* if (stat) */
- __svgalib_waitvtactive();
- __svgalib_runinbackground = stat;
-@@ -3939,11 +4062,11 @@
+ if (!flip) /* set graphics mode termio */
+@@ -2303,11 +2302,10 @@
+ modeinfo.flags &= modeinfo_mask;
+
+ /* Many cards have problems with linear 320x200x256 mode */
+- if(mode==G320x200x256)modeinfo.flags &= (~CAPABLE_LINEAR) & (~IS_LINEAR) ;
++ if(mode==G320x200x256)modeinfo.flags &= (~CAPABLE_LINEAR) & (~LINEAR_USE);
+
+- /* If all needed info is here, signal if linear support has been enabled */
+- if ((modeinfo.flags & (CAPABLE_LINEAR | EXT_INFO_AVAILABLE)) ==
+- (CAPABLE_LINEAR | EXT_INFO_AVAILABLE)) {
++ /* Signal if linear support has been enabled */
++ if (modeinfo.flags & CAPABLE_LINEAR) {
+ modeinfo.flags |= __svgalib_modeinfo_linearset;
+ }
+
+@@ -2622,7 +2620,7 @@
+
+ size = VMEM;
+ alloc_graph_buf(size);
+- if(__svgalib_modeinfo_linearset & LINEAR_USE) {
++ if( CAN_USE_LINEAR ) {
+ memcpy(graph_buf, LINEAR_POINTER, size);
+ } else {
+ page = 0;
+@@ -2643,6 +2641,7 @@
+ static void restorestate(void)
+ {
+ int i;
++ vga_modeinfo *modeinfo;
+
+ vga_screenoff();
+
+@@ -2658,6 +2657,12 @@
+ if(saved_linear)
+ vga_setlinearaddressing();
+
++ modeinfo = vga_getmodeinfo(CM);
++ if (__svgalib_emulatepage && (modeinfo->flags & CAPABLE_LINEAR) &&
++ !(modeinfo->flags & LINEAR_USE)) {
++ __svgalib_driverspecs->linear(LINEAR_ENABLE, 0);
++ }
++
+ if (CM == G320x200x256 && VMEM <= 65536) {
+ memcpy(GM, graph_buf, 65536);
+ } else if (MODEX || CM == G800x600x16 || (STDVGAMODE(CM) && CM != G320x200x256)) {
+@@ -2716,7 +2721,7 @@
+
+ DPRINTF("Restoring %dK of video memory.\n", (size + 2) / 1024);
+
+- if(__svgalib_modeinfo_linearset & LINEAR_USE) {
++ if( CAN_USE_LINEAR ) {
+ memcpy(LINEAR_POINTER, graph_buf, size);
+ } else {
+ page = 0;
+@@ -4030,34 +4035,41 @@
+ "read- and writepages, ignoring runinbackground request.\n");
+ break;
+ }
++ /* If we don't have /dev/mem available we can't do runinbackground
++ * with the real banked mem, see if we do have an fd for the LFB
++ * and if it is ok to switch to emulating pages. */
+ if (__svgalib_mem_fd == -1) {
+- vga_modeinfo *modeinfo = vga_getmodeinfo(CM);
+- /* we don't have /dev/mem available so we can't do runinbackground
+- * with the real banked mem, see if we do have an fd for the LFB
+- * and if it is ok to switch to emulating pages. */
+- if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || (
+- ( (modeinfo->flags & CAPABLE_LINEAR) ||
+- (modeinfo->flags & LINEAR_USE) ) &&
+- (!STDVGAMODE(CM) || (CM == G320x200x256)) ))) {
+- /* only do this if we are not already emulating pages */
+- if (!__svgalib_emulatepage) {
+- __svgalib_emulatepage=1;
++ int hasmode = 0;
++ if (__svgalib_linear_mem_fd != -1)
++ {
++ if (!__svgalib_emulatepage)
++ {
++ /* see if we can do CM with emulatepage */
++ __svgalib_emulatepage = 1;
++ hasmode = vga_hasmode(CM);
++ if (hasmode) {
+ __svgalib_setrdpage=NULL;
+ __svgalib_setwrpage=NULL;
+ if (CM != TEXT) {
++ vga_modeinfo *modeinfo = vga_getmodeinfo(CM);
+ (*__svgalib_setpage)(vga_page_offset);
+ if ((modeinfo->flags & CAPABLE_LINEAR) &&
+ !(modeinfo->flags & LINEAR_USE)) {
+ __svgalib_driverspecs->linear(LINEAR_ENABLE, 0);
+- __svgalib_modeinfo_linearset |= IS_LINEAR;
+ }
+ }
+ map_banked(MAP_FIXED);
+ }
+- } else {
++ else
++ __svgalib_emulatepage = 0;
++ }
++ else
++ hasmode = 1;
++ }
++ if (!hasmode) {
+ fprintf(stderr,
+ "svgalib: Warning runinbackground not supported "
+- "inohelper mode, ignoring\n"
++ "in nohelper mode, ignoring\n"
+ " runinbackground request. Program should check "
+ "vga_runinbackground_version\n"
+ " before calling vga_runinbackground\n");
+@@ -4075,31 +4087,33 @@
/* Program can check, if it is safe to in background. */
int vga_runinbackground_version(void)
{
-- /* we need to read the configfile here to get the correct value
-- for __svgalib_nohelper and __svgalib_nohelper_secure */
-- readconfigfile();
-+ /* getchipset opens, maps and perhaps closes the LFB,
-+ we need an open LFB to be able to runinbackground */
-+ __svgalib_getchipset();
+- vga_modeinfo *modeinfo;
++ const int runinbackground_version = 3;
++ int hasmode;
+
+- /* getchipset opens, maps and perhaps closes the LFB,
++ /* getchipset opens, maps and perhaps closes the LFB,
+ we need an open LFB to be able to runinbackground.
+ Also we need to know the chipset for getmodeinfo(). */
+-
+- __svgalib_getchipset();
++ __svgalib_getchipset();
-- if (__svgalib_nohelper && __svgalib_nohelper_secure)
-+ if (__svgalib_linear_mem_fd == -1)
- return 0;
-
- return 3;
-Only in svgalib-1.9.21/src: vga.c.wip
-Only in svgalib-1.9.21/src: vga.c~
-diff -urBbw svgalib-1.9.21.orig/src/vgapci.c svgalib-1.9.21/src/vgapci.c
---- svgalib-1.9.21.orig/src/vgapci.c 2005-07-30 15:22:24.000000000 +0200
-+++ svgalib-1.9.21/src/vgapci.c 2005-07-30 09:16:04.000000000 +0200
-@@ -10,6 +10,7 @@
-
- int __svgalib_pci_helper_idev=0;
- int __svgalib_pci_nohelper_idev=0;
-+int __svgalib_pci_card_found_at=0;
+ if (__svgalib_mem_fd != -1)
+- return 3;
++ return runinbackground_version;
+
+- if (__svgalib_linear_mem_fd == -1)
+- return 0;
+-
+ /* we don't have /dev/mem available so we can't do runinbackground
+ with the real banked mem, see if we do have an fd for the LFB
+ and if it is ok to switch to emulating pages. */
+-
+- modeinfo = vga_getmodeinfo(CM);
+- if ((__svgalib_linear_mem_fd != -1) && ( (CM == TEXT) || (
+- ( (modeinfo->flags & CAPABLE_LINEAR) ||
+- (modeinfo->flags & LINEAR_USE) ) &&
+- (!STDVGAMODE(CM) || (CM == G320x200x256)) )))
+- return 3;
++ if (__svgalib_linear_mem_fd == -1)
++ return 0;
+
++ if (__svgalib_emulatepage)
++ return runinbackground_version;
++
++ /* see if we can do CM with emulatepage */
++ __svgalib_emulatepage = 1;
++ hasmode = vga_hasmode(CM);
++ __svgalib_emulatepage = 0;
++ if (hasmode)
++ return runinbackground_version;
++
+ return 0;
+ }
- static void proc_pci_read_config(int device, unsigned int *buf, int size)
- {
-@@ -57,6 +58,7 @@
- if(((conf[0]&0xffff)==vendor)&&
- (((conf[2]>>16)&0xffff)==0x0300)) { /* VGA Class */
- proc_pci_read_config(device,conf,16);
-+ __svgalib_pci_card_found_at = device;
- return device;
- }
- }
-Only in svgalib-1.9.21/src: vgapci.c.wip
-diff -urBbw svgalib-1.9.21.orig/src/vgapci.h svgalib-1.9.21/src/vgapci.h
---- svgalib-1.9.21.orig/src/vgapci.h 2005-07-30 15:22:24.000000000 +0200
-+++ svgalib-1.9.21/src/vgapci.h 2005-07-30 09:16:04.000000000 +0200
-@@ -1,6 +1,7 @@
- extern int __svgalib_pci_find_vendor_vga_pos(unsigned int vendor, unsigned int *conf);
- extern int __svgalib_pci_helper_idev;
- extern int __svgalib_pci_nohelper_idev;
-+extern int __svgalib_pci_card_found_at;
- extern void __svgalib_pci_write_config_dword(int pos, int address, unsigned int data);
- extern unsigned int __svgalib_pci_read_config_dword(int pos, int address);
- extern unsigned long __svgalib_pci_read_aperture_len(int pos, int address);
-Only in svgalib-1.9.21/src: vgapci.h.wip
-Only in svgalib-1.9.21/threeDKit: 3dinit.o
-Only in svgalib-1.9.21/threeDKit: 3dkit.o
-Only in svgalib-1.9.21/threeDKit: lib3dkit.so.1.9.22
-Only in svgalib-1.9.21/threeDKit: quickmath.o
-Only in svgalib-1.9.21/threeDKit: swtriangle.o
-Only in svgalib-1.9.21/threeDKit: triangl.o
-Only in svgalib-1.9.21/threeDKit: triangle.o
-Only in svgalib-1.9.21/threeDKit: wrapsurf.o
-Only in svgalib-1.9.21/threeDKit: wtriangle.o
-Only in svgalib-1.9.21/utils: .depend
-Only in svgalib-1.9.21/utils: convfont
-Only in svgalib-1.9.21/utils: convfont.o
-Only in svgalib-1.9.21/utils: dumpreg
-Only in svgalib-1.9.21/utils: dumpreg.o
-Only in svgalib-1.9.21/utils: gtfcalc
-Only in svgalib-1.9.21/utils: restorefont
-Only in svgalib-1.9.21/utils: restorefont.o
-Only in svgalib-1.9.21/utils: restorepalette
-Only in svgalib-1.9.21/utils: restorepalette.o
-Only in svgalib-1.9.21/utils: restoretextmode
-Only in svgalib-1.9.21/utils: restoretextmode.o
+--- svgalib-1.9.21/src/vgamisc.c.wip 2005-08-16 13:42:55.000000000 +0200
++++ svgalib-1.9.21/src/vgamisc.c 2005-08-16 13:42:55.000000000 +0200
+@@ -55,7 +55,7 @@
+
+ /*
+ * The way IS_LINEAR gets indicated is rather convoluted; if the driver
+- * has EXT_INFO_AVAILABLE, setlinearaddressing will enable
++ * is CAPABLE_LINEAR, setlinearaddressing will enable
+ * the flag in __svgalib_linearset which gets set in the modeinfo by
+ * vga_getmodeinfo(). The driver must turn off the flag in
+ * __svgalib_linearset if linear addressing gets disabled (e.g. when
+--- svgalib-1.9.21/src/drivers/r128.c.wip 2005-08-16 13:43:21.000000000 +0200
++++ svgalib-1.9.21/src/drivers/r128.c 2005-08-16 13:47:09.000000000 +0200
+@@ -1033,7 +1033,9 @@
+ ModeTiming *modetiming;
+ ModeInfo *modeinfo;
+
+- modeinfo = __svgalib_createModeInfoStructureForSvgalibMode(mode);
++ /* On radeon's 320x200x256 (INT13) only works with the real banked mem */
++ if ((chiptype==Radeon) && (mode==G320x200x256) && __svgalib_emulatepage)
++ return 0;
+
+ if (IS_IN_STANDARD_VGA_DRIVER(mode))
+ return __svgalib_vga_driverspecs.modeavailable(mode);
svgalib-1.9.22.diff:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 svgalib-1.9.22.diff
Index: svgalib-1.9.22.diff
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib-1.9.22.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svgalib-1.9.22.diff 5 Aug 2005 09:37:40 -0000 1.1
+++ svgalib-1.9.22.diff 16 Aug 2005 11:55:30 -0000 1.2
@@ -35,6 +35,19 @@
# NO_HELPER = y
# uncomment this if your compiler fails on compiling the assembler in
+diff -X xclude -ubBwrN svgalib-1.9.21/demos/accel.c svgalib-1.9.22/demos/accel.c
+--- svgalib-1.9.21/demos/accel.c 2002-04-03 10:30:23.000000000 +0300
++++ svgalib-1.9.22/demos/accel.c 2005-08-03 16:07:31.000000000 +0300
+@@ -924,7 +924,8 @@
+ void QixDemo(int rop, char *txt) {
+ int current = 0, dx1, dy1, dx2, dy2, i, cols = 1, cx1, cx2, cy1, cy2;
+ int startclock, diffclock;
+- unsigned long pixels = 0, numlines = 0;
++ unsigned long pixels = 0;
++ unsigned int numlines = 0;
+ struct {
+ unsigned short x1;
+ unsigned short y1;
diff -X xclude -ubBwrN svgalib-1.9.21/demos/bg_test.c svgalib-1.9.22/demos/bg_test.c
--- svgalib-1.9.21/demos/bg_test.c 2000-01-06 14:12:36.000000000 +0200
+++ svgalib-1.9.22/demos/bg_test.c 2005-07-16 22:59:22.000000000 +0300
@@ -55,6 +68,33 @@
printf("Test ended.\n");
return(0);
}
+diff -X xclude -ubBwrN svgalib-1.9.21/demos/memset.c svgalib-1.9.22/demos/memset.c
+--- svgalib-1.9.21/demos/memset.c 2002-07-20 19:58:13.000000000 +0300
++++ svgalib-1.9.22/demos/memset.c 2005-08-03 16:07:31.000000000 +0300
+@@ -26,7 +26,7 @@
+
+ #undef memset
+
+-#define op_t unsigned long int
++#define op_t unsigned int
+ #define OPSIZ 4
+
+
+diff -X xclude -ubBwrN svgalib-1.9.21/demos/spin.c svgalib-1.9.22/demos/spin.c
+--- svgalib-1.9.21/demos/spin.c 2000-01-06 14:12:36.000000000 +0200
++++ svgalib-1.9.22/demos/spin.c 2005-08-03 16:07:31.000000000 +0300
+@@ -78,9 +78,9 @@
+
+ #define HORIZONTAL 0
+
+-typedef unsigned int WORD;
++typedef unsigned short WORD;
+ typedef unsigned char BYTE;
+-typedef unsigned long DWORD;
++typedef unsigned int DWORD;
+
+ typedef struct {
+ float x, y, z;
diff -X xclude -ubBwrN svgalib-1.9.21/demos/testgl.c svgalib-1.9.22/demos/testgl.c
--- svgalib-1.9.21/demos/testgl.c 2002-04-03 10:31:14.000000000 +0300
+++ svgalib-1.9.22/demos/testgl.c 2005-07-27 14:46:06.000000000 +0300
@@ -192,6 +232,61 @@
+.SH AUTHOR
+This manual page was written by Guillem Jover <guillem at debian.org>.
+
+diff -X xclude -ubBwrN svgalib-1.9.21/gl/driver.c svgalib-1.9.22/gl/driver.c
+--- svgalib-1.9.21/gl/driver.c 2000-04-18 12:45:18.000000000 +0300
++++ svgalib-1.9.22/gl/driver.c 2005-08-03 16:07:31.000000000 +0300
+@@ -1135,7 +1135,7 @@
+ {
+ char *vp;
+ ASSIGNVP32(x1, y, vp);
+- __memsetlong(vp, c, x2 - x1 + 1);
++ __memset4(vp, c, x2 - x1 + 1);
+ }
+
+ void __svgalib_driver32p_hline(int x1, int y, int x2, int c)
+@@ -1148,11 +1148,11 @@
+ SETWRITEPAGED(vp, rvp, chunksize, page);
+ l = (x2 - x1 + 1) * 4;
+ if (l <= chunksize)
+- __memsetlong(rvp, c, l / 4);
++ __memset4(rvp, c, l / 4);
+ else {
+- __memsetlong(rvp, c, chunksize / 4);
++ __memset4(rvp, c, chunksize / 4);
+ vga_setpage(page + 1);
+- __memsetlong(VBUF, c, (l - chunksize) / 4);
++ __memset4(VBUF, c, (l - chunksize) / 4);
+ }
+ }
+
+@@ -1162,7 +1162,7 @@
+ int i;
+ ASSIGNVP32(x, y, vp);
+ for (i = 0; i < h; i++) {
+- __memsetlong(vp, c, w);
++ __memset4(vp, c, w);
+ vp += BYTEWIDTH;
+ }
+ }
+@@ -1183,15 +1183,15 @@
+ vga_setpage(page);
+ vp &= 0xffff;
+ } else { /* page break within line */
+- __memsetlong(VBUF + vp, c, (0x10000 - vp) / 4);
++ __memset4(VBUF + vp, c, (0x10000 - vp) / 4);
+ page++;
+ vga_setpage(page);
+- __memsetlong(VBUF, c, ((vp + w * 4) & 0xffff) / 4);
++ __memset4(VBUF, c, ((vp + w * 4) & 0xffff) / 4);
+ vp = (vp + BYTEWIDTH) & 0xffff;
+ continue;
+ }
+ };
+- __memsetlong(VBUF + vp, c, w);
++ __memset4(VBUF + vp, c, w);
+ vp += BYTEWIDTH;
+ }
+ }
diff -X xclude -ubBwrN svgalib-1.9.21/gl/grlib.c svgalib-1.9.22/gl/grlib.c
--- svgalib-1.9.21/gl/grlib.c 2002-04-19 11:15:31.000000000 +0300
+++ svgalib-1.9.22/gl/grlib.c 2005-07-27 14:48:42.000000000 +0300
@@ -203,6 +298,60 @@
#include <vga.h>
#include "inlstring.h" /* include inline string operations */
+diff -X xclude -ubBwrN svgalib-1.9.21/gl/inlstring.h svgalib-1.9.22/gl/inlstring.h
+--- svgalib-1.9.21/gl/inlstring.h 2005-04-17 10:07:19.000000000 +0300
++++ svgalib-1.9.22/gl/inlstring.h 2005-08-03 16:07:31.000000000 +0300
+@@ -11,9 +11,8 @@
+ #define __memsetb(dst,c,n) memset((dst),(c),(n))
+ #define __memset(dst,c,n) memset((dst),(c),(n))
+
+-static inline void *__memsetlong(void *s, long c, size_t count) {
+- long *p=s;
+- int i;
++static inline void *__memset4(void *s, int c, size_t count) {
++ int i, *p=s;
+ for(i=0;i<count;i++)*p++=c;
+ return s;
+ }
+@@ -25,7 +24,7 @@
+ return s;
+ }
+
+-static inline void *__memset3(void *s, short c, size_t count) {
++static inline void *__memset3(void *s, int c, size_t count) {
+ unsigned char *p=s;
+ int i;
+ for(i=0;i<count;i++) {
+@@ -96,7 +95,7 @@
+ }
+
+ static inline void *
+- __memsetlong(void *s, unsigned c, size_t count)
++ __memset4(void *s, unsigned c, size_t count)
+ {
+ long dummy1;
+ int dummy2;
+diff -X xclude -ubBwrN svgalib-1.9.21/gl/line.c svgalib-1.9.22/gl/line.c
+--- svgalib-1.9.21/gl/line.c 2000-04-18 11:47:33.000000000 +0300
++++ svgalib-1.9.22/gl/line.c 2005-08-03 16:07:31.000000000 +0300
+@@ -204,7 +204,7 @@
+ *((unsigned char *) (vp + 1)) = (c>>8); \
+ *((unsigned char *) (vp + 2)) = (c>>16);
+
+-#define insert_pixel_4 *((unsigned long *) vp) = c;
++#define insert_pixel_4 *((unsigned int *) vp) = c;
+
+ bytesperrow = BYTEWIDTH;
+
+@@ -301,7 +301,7 @@
+ *((unsigned char *) (vp + fp + 1)) = (c>>8); \
+ *((unsigned char *) (vp + fp + 2)) = (c>>16);
+
+-#define insert_pixel_4 *((unsigned long *) (vp + fp)) = c;
++#define insert_pixel_4 *((unsigned int *) (vp + fp)) = c;
+
+
+ if (MODETYPE == CONTEXT_PAGED) {
diff -X xclude -ubBwrN svgalib-1.9.21/gl/text.c svgalib-1.9.22/gl/text.c
--- svgalib-1.9.21/gl/text.c 2000-03-08 21:04:38.000000000 +0200
+++ svgalib-1.9.22/gl/text.c 2005-07-02 18:41:38.000000000 +0300
@@ -303,9 +452,131 @@
endif
ifdef DEBUG_ACCEL
DEFINES += -DDEBUG_ACCEL
+diff -X xclude -ubBwrN svgalib-1.9.21/src/clockchip/clockchip.h svgalib-1.9.22/src/clockchip/clockchip.h
+--- svgalib-1.9.21/src/clockchip/clockchip.h 1997-06-22 18:46:22.000000000 +0300
++++ svgalib-1.9.22/src/clockchip/clockchip.h 2005-08-03 16:07:31.000000000 +0300
+@@ -25,7 +25,7 @@
+ void (*DAC_restoreState) (const unsigned char *regs);
+ void (*DAC_initializeState) (unsigned char *regs, int bpp, int colormode,
+ int pixelclock);
+- long TextFrequency;
++ int TextFrequency;
+ int DAC_stateSize;
+ } ClockChipMethods;
[...4259 lines suppressed...]
+ {
+- return (long) x *x;
++ return (int) x *x;
+ }
+
+ extern inline double fmax (double a, double b)
+diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/tri.c svgalib-1.9.22/threeDKit/tri.c
+--- svgalib-1.9.21/threeDKit/tri.c 2002-07-20 19:34:53.000000000 +0300
++++ svgalib-1.9.22/threeDKit/tri.c 2005-08-03 16:07:32.000000000 +0300
+@@ -52,18 +52,18 @@
+ void (*colhline_neg) (void);
+
+ int dir;
+- long X;
++ int X;
+
+- long nz;
+- long g0, g1h = 0, g1l = 0;
++ int nz;
++ int g0, g1h = 0, g1l = 0;
+ #ifdef INTERP
+- long c0;
+- long c_y;
++ int c0;
++ int c_y;
+ #endif
+ #ifdef WRAP
+- long X0, Y0;
++ int X0, Y0;
+ int bf = tri->bf;
+- long xd_y, yd_y;
++ int xd_y, yd_y;
+ #endif
+
+ dir = 1;
+@@ -197,11 +197,11 @@
+
+ if (y2 == y0)
+ return;
+- g0 = ((long) (x2 - x0) << SHLB) / (y2 - y0);
++ g0 = ((int) (x2 - x0) << SHLB) / (y2 - y0);
+ if (y1 != y0)
+- g1h = ((long) (x1 - x0) << SHLB) / (y1 - y0);
++ g1h = ((int) (x1 - x0) << SHLB) / (y1 - y0);
+ if (y2 != y1)
+- g1l = ((long) (x2 - x1) << SHLB) / (y2 - y1);
++ g1l = ((int) (x2 - x1) << SHLB) / (y2 - y1);
+
+ dir = dir & 1;
+
+diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/triangl.c svgalib-1.9.22/threeDKit/triangl.c
+--- svgalib-1.9.21/threeDKit/triangl.c 1997-10-03 20:34:37.000000000 +0200
++++ svgalib-1.9.22/threeDKit/triangl.c 2005-08-03 16:07:32.000000000 +0300
+@@ -146,33 +146,33 @@
+
+
+ static int px1, px2, py;
+-static long c;
++static int c;
+
+ #ifdef INTERP
+-static long c_x;
++static int c_x;
+ #endif
+
+ #ifdef WRAP
+-static long xd, xd_x, yd, yd_x;
++static int xd, xd_x, yd, yd_x;
+ static unsigned char *dat;
+ #endif
+
+-static long dx0, dy0;
++static int dx0, dy0;
+
+ #if defined(WRAP) && defined(INTERP)
+
+ /* this must only occur once */
+
+-long color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE];
+-static long *_color_lookup;
++int color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE];
++static int *_color_lookup;
+
+-void gl_trisetcolorlookup (int i, long c)
++void gl_trisetcolorlookup (int i, int c)
+ {
+ if(i < TRIANGLE_COLOR_LOOKUP_TABLE_SIZE)
+ color_lookup[i] = c;
+ }
+
+-long gl_trigetcolorlookup (int i)
++int gl_trigetcolorlookup (int i)
+ {
+ if(i < TRIANGLE_COLOR_LOOKUP_TABLE_SIZE)
+ return color_lookup[i];
+@@ -189,8 +189,8 @@
+
+ #else
+
+-extern long color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE];
+-static long *_color_lookup;
++extern int color_lookup[TRIANGLE_COLOR_LOOKUP_TABLE_SIZE];
++static int *_color_lookup;
+ extern void (*tri_drawpoint) (int, int, int);
+ static void (*_tri_drawpoint) (int, int, int);
+
+diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/triangle.h svgalib-1.9.22/threeDKit/triangle.h
+--- svgalib-1.9.21/threeDKit/triangle.h 1997-06-06 00:52:43.000000000 +0300
++++ svgalib-1.9.22/threeDKit/triangle.h 2005-08-03 16:07:32.000000000 +0300
+@@ -23,7 +23,7 @@
+
+ void gl_striangle (int x0, int y0, int x1, int y1, int x2, int y2, int color, int bf);
+
+-void gl_trisetcolorlookup (int i, long c);
+-long gl_trigetcolorlookup (int i);
++void gl_trisetcolorlookup (int i, int c);
++int gl_trigetcolorlookup (int i);
+
+ void gl_trisetdrawpoint (void (setpixelfunc) (int, int, int));
+diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/trisetpixel.c svgalib-1.9.22/threeDKit/trisetpixel.c
+--- svgalib-1.9.21/threeDKit/trisetpixel.c 1997-10-03 20:34:41.000000000 +0200
++++ svgalib-1.9.22/threeDKit/trisetpixel.c 2005-08-03 16:07:32.000000000 +0300
+@@ -219,7 +219,7 @@
+ unsigned short offst;
+ int pg;
+ declarevp;
+- long vp = 0;
++ int vp = 0;
+ if (__clip) {
+ if (y < __clipy1 || y > __clipy2)
+ return;
+@@ -275,7 +275,7 @@
+ unsigned short offst;
+ int pg;
+ declarevp;
+- long vp = 0;
++ int vp = 0;
+ if (__clip) {
+ if (y < __clipy1 || y > __clipy2)
+ return;
diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/wrapdemo.c svgalib-1.9.22/threeDKit/wrapdemo.c
--- svgalib-1.9.21/threeDKit/wrapdemo.c 2000-02-19 11:16:02.000000000 +0200
-+++ svgalib-1.9.22/threeDKit/wrapdemo.c 2005-05-13 00:54:42.000000000 +0300
++++ svgalib-1.9.22/threeDKit/wrapdemo.c 2005-08-03 16:07:32.000000000 +0300
+@@ -105,7 +105,7 @@
+ void xchgxy (TD_Surface * surf)
+ {
+ int j;
+- long t;
++ int t;
+
+ for (j = 0; j < surf->l * surf->w; j++) {
+ t = surf->point[j].x;
+@@ -169,7 +169,7 @@
+ /* These two are scale factors for the screen: */
+ /* xscale is now calculated so that the maximum volume (-2^15 to 2^15 or
+ -2^31 to 2^31) will just fit inside the screen width at this distance: */
+- ellip_demo->xscale = (long) ellip_demo->distance * EL_screen_width / (32768 * 2);
++ ellip_demo->xscale = (int) ellip_demo->distance * EL_screen_width / (32768 * 2);
+ ellip_demo->yscale = (float) ellip_demo->xscale * EL_SCREEN_ASPECT
+ * EL_screen_height / EL_screen_width; /*to get display aspect square */
+
@@ -491,7 +491,7 @@
}
@@ -6748,6 +9206,34 @@
{
int i;
int mode[7] = {5, 6, 7, 8, 10, 11, 12};
+diff -X xclude -ubBwrN svgalib-1.9.21/threeDKit/wrapsurf.c svgalib-1.9.22/threeDKit/wrapsurf.c
+--- svgalib-1.9.21/threeDKit/wrapsurf.c 1997-10-03 20:34:52.000000000 +0200
++++ svgalib-1.9.22/threeDKit/wrapsurf.c 2005-08-03 16:07:32.000000000 +0300
+@@ -90,15 +90,15 @@
+ int, int, int, int, int,
+ TD_tridata *) = s->draw_wtriangle;
+ int mesh;
+- long d1, d2, d3, d4, d;
+- long x1, y1, c1;
+- long x2, y2, c2;
+- long x3, y3, c3;
+- long x4, y4, c4;
+- long u1, v1;
+- long u2, v2;
+- long u3, v3;
+- long u4, v4;
++ int d1, d2, d3, d4, d;
++ int x1, y1, c1;
++ int x2, y2, c2;
++ int x3, y3, c3;
++ int x4, y4, c4;
++ int u1, v1;
++ int u2, v2;
++ int u3, v3;
++ int u4, v4;
+ int furthest, clockwise = 0;
+ TD_tridata tri;
+
diff -X xclude -ubBwrN svgalib-1.9.21/utils/convfont.c svgalib-1.9.22/utils/convfont.c
--- svgalib-1.9.21/utils/convfont.c 1995-09-30 16:50:30.000000000 +0200
+++ svgalib-1.9.22/utils/convfont.c 2005-07-02 18:41:37.000000000 +0300
Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- svgalib.spec 7 Aug 2005 07:49:52 -0000 1.4
+++ svgalib.spec 16 Aug 2005 11:55:30 -0000 1.5
@@ -1,6 +1,6 @@
Name: svgalib
Version: 1.9.21
-Release: 4
+Release: 5
Exclusivearch: %{ix86} x86_64
Summary: Low-level fullscreen SVGA graphics library
@@ -14,11 +14,8 @@
Patch2: svgalib-1.4.3-fhs.patch
Patch3: svgalib-1.9.21-demos.patch
Patch4: svgalib-1.9.21-wip.patch
-Patch5: svgalib-1.9.21-wip2.patch
-Patch6: svgalib-1.9.21-cfg.patch
-Patch7: svgalib-1.9.21-x86_64.patch
-Patch8: svgalib-1.9.21-ppc.patch
-Patch9: svgalib-1.9.21-wip3.patch
+Patch5: svgalib-1.9.21-cfg.patch
+Patch6: svgalib-1.9.21-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: libvga = %{version}-%{release}
@@ -47,13 +44,10 @@
%patch2 -p1 -b .fhs
%patch3 -p1
%patch4 -p1 -b .wip
-%patch5 -p1 -b .wip2
-%patch6 -p1 -b .defaultcfg
+%patch5 -p1 -b .defaultcfg
%ifnarch %{ix86}
-%patch7 -p1 -b .x86_64
+%patch6 -p1 -b .x86_64
%endif
-#%patch8 -p1 -b .ppc
-%patch9 -p1 -b .wip3
#the testlinear demo needs svgalib's internal libvga header, so copy it to the
#demo dir
@@ -135,6 +129,9 @@
%{_mandir}/man3/*
%changelog
+* Tue Aug 16 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-5
+- Merge with upstream, drop merged patches, fix dark vga modes on radeon.
+
* Sun Aug 7 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-4
- Add patch 9 which fixes 320x200x256(mode 5) on atleast radeons and probably
others too.
--- svgalib-1.9.21-ppc.patch DELETED ---
--- svgalib-1.9.21-wip2.patch DELETED ---
--- svgalib-1.9.21-wip3.patch DELETED ---
More information about the fedora-extras-commits
mailing list