Attachment 179103 Details for Bug 216288 – update x11-drivers/xf86-video-rendition to 4.2.6

[patch] update x11-drivers/xf86-video-rendition to 4.2.6

x11-drivers_xf86-video-rendition.patch (text/plain), 5.13 KB, created by Matthew Rezny on 2017-01-19 21:40:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2017-01-19 21:40:14 UTC

Size: 5.13 KB

patch

obsolete

>Index: x11-drivers/xf86-video-rendition/Makefile
>===================================================================
>--- x11-drivers/xf86-video-rendition/Makefile	(revision 431798)
>+++ x11-drivers/xf86-video-rendition/Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	xf86-video-rendition
>-PORTVERSION=	4.2.5
>-PORTREVISION=	7
>+PORTVERSION=	4.2.6
> CATEGORIES=	x11-drivers
> 
> MAINTAINER=	x11@FreeBSD.org
>Index: x11-drivers/xf86-video-rendition/distinfo
>===================================================================
>--- x11-drivers/xf86-video-rendition/distinfo	(revision 431798)
>+++ x11-drivers/xf86-video-rendition/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb
>-SIZE (xorg/driver/xf86-video-rendition-4.2.5.tar.bz2) = 356351
>+TIMESTAMP = 1480082861
>+SHA256 (xorg/driver/xf86-video-rendition-4.2.6.tar.bz2) = 660ecf21f65a4d6002c1b603d62c314f8e9624d208db5b346850b0df9dc2f9a8
>+SIZE (xorg/driver/xf86-video-rendition-4.2.6.tar.bz2) = 362408
>Index: x11-drivers/xf86-video-rendition/files/patch-src_rendition.c
>===================================================================
>--- x11-drivers/xf86-video-rendition/files/patch-src_rendition.c	(revision 431798)
>+++ x11-drivers/xf86-video-rendition/files/patch-src_rendition.c	(working copy)
>@@ -1,51 +1,13 @@
>---- src/rendition.c.orig	2015-10-11 22:31:51.242126000 +0200
>-+++ src/rendition.c	2015-10-11 22:32:20.465605000 +0200
>-@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC
>-     fbPictureInit (pScreen, 0, 0);
>- 
>-     xf86SetBlackWhitePixels(pScreen);
>--    miInitializeBackingStore(pScreen);
>-    
>-     /*********************************************************/
>-     /* The actual setup of the driver-specific code          */
>-@@ -1372,6 +1371,18 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
>-        /* Override on users request */
>-     WriteCombine
>- 	= xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine);
>-+#ifdef XSERVER_LIBPCIACCESS
>-+    mapOption = PCI_DEV_MAP_FLAG_WRITABLE;
>-+    if (WriteCombine)
>-+	mapOption |= PCI_DEV_MAP_FLAG_WRITE_COMBINE;
>-+
>-+    err = pci_device_map_range(pRendition->PciInfo,
>-+			       pRendition->PciInfo->regions[0].base_addr,
>-+			       pRendition->PciInfo->regions[0].size,
>-+			       mapOption, (void *)&pRendition->board.vmem_base);
>-+
>-+    return (err == 0);
>-+#else
>-     if (WriteCombine) {
>- 	xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
>- 		   ("Requesting Write-Combined memory access\n"));
>-@@ -1382,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
>- 	mapOption = VIDMEM_MMIO;
>-     }
>- 
>--#ifdef XSERVER_LIBPCIACCESS
>--    err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
>--    pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
>--
>--    return (err == 0);
>--#else
>-     pRendition->board.vmem_base=
>-         xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
>- 		      pRendition->pcitag,
>-@@ -1416,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInf
>- #else
>-     pci_device_unmap_range(pRendition->PciInfo, 
>- 			   pRendition->board.vmem_base,
>--			   pScreenInfo->videoRam * 1024);
>-+			   pRendition->PciInfo->regions[0].size);
>- #endif
>-     return TRUE;
>- #ifdef DEBUG0
>+# Correct a string that should be const
>+#
>+--- src/rendition.c.orig	2014-09-30 14:21:44 UTC
>++++ src/rendition.c
>+@@ -480,7 +480,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo
>+     MessageType       From;
>+     int               videoRam, Rounding, nModes = 0;
>+     renditionPtr      pRendition;
>+-    char             *in_string;
>++    const char       *in_string;
>+     vgaHWPtr          pvgaHW;
>+     
>+ #ifdef DEBUG
>Index: x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
>===================================================================
>--- x11-drivers/xf86-video-rendition/files/patch-src_rendition.h	(revision 431798)
>+++ x11-drivers/xf86-video-rendition/files/patch-src_rendition.h	(nonexistent)
>@@ -1,31 +0,0 @@
>---- src/rendition.h.orig	2015-10-11 22:31:54.085176000 +0200
>-+++ src/rendition.h	2015-10-11 22:32:12.657760000 +0200
>-@@ -14,9 +14,6 @@
>- /* Everything using inb/outb, etc needs "compiler.h" */
>- #include "compiler.h"
>- 
>--/* Drivers for PCI hardware need this */
>--#include "xf86PciInfo.h"
>--
>- /* Drivers that need to access the PCI config space directly need this */
>- #include "xf86Pci.h"
>- 
>-@@ -28,9 +25,6 @@
>- /* All drivers initialising the SW cursor need this */
>- #include "mipointer.h"
>- 
>--/* All drivers implementing backing store need this */
>--#include "mibstore.h"
>--
>- /* All drivers using the mi colormap manipulation need this */
>- #include "micmap.h"
>- 
>-@@ -69,4 +63,8 @@
>- 
>- #include "compat-api.h"
>- /* end of __RENDITION_H__ */
>-+
>-+#define PCI_CHIP_V1000 0x0001
>-+#define PCI_CHIP_V2x00 0x2000
>-+
>- #endif
>
>Property changes on: x11-drivers/xf86-video-rendition/files/patch-src_rendition.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216288: 179103