cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 6.14.2.

Browse Source 
PR:		ports/157572 (based on)
Submitted by:	Warren Block <wblock@wonkity.com>
This commit is contained in:
Koop Mast 2011-07-19 15:18:31 +00:00
parent ae8a628383
commit bbcd8abe55
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=277953
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11-drivers/xf86-video-ati/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ati
PORTVERSION= 6.14.1
PORTREVISION= 1
PORTVERSION= 6.14.2
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

4
x11-drivers/xf86-video-ati/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xorg/driver/xf86-video-ati-6.14.1.tar.bz2) = e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75
SIZE (xorg/driver/xf86-video-ati-6.14.1.tar.bz2) = 1058696
SHA256 (xorg/driver/xf86-video-ati-6.14.2.tar.bz2) = 017974b622eea3b4483405368492b0c6f178854a9b9753d50e13c578b8a328dc
SIZE (xorg/driver/xf86-video-ati-6.14.2.tar.bz2) = 1072263

42
x11-drivers/xf86-video-ati/files/patch-ums
View File

@ -1,42 +0,0 @@
From fe2e0ad3ffa58f40311319c950b842e2928a5740 Mon Sep 17 00:00:00 2001
From: matthew green <mrg@eterna.com.au>
Date: Mon, 21 Mar 2011 16:17:58 +0000
Subject: bug fix for r6xx/r7xx UMS
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 0ed0ced..7736d24 100644
--- src/r600_exa.c
+++ src/r600_exa.c
@@ -621,8 +621,12 @@ R600PrepareCopy(PixmapPtr pSrc, PixmapPtr pDst,
return FALSE;
if (accel_state->same_surface == TRUE) {
+#if defined(XF86DRM_MODE)
unsigned height = RADEON_ALIGN(pDst->drawable.height,
drmmode_get_height_align(pScrn, accel_state->dst_obj.tiling_flags));
+#else
+ unsigned height = pDst->drawable.height;
+#endif
unsigned long size = height * accel_state->dst_obj.pitch * pDst->drawable.bitsPerPixel/8;
#if defined(XF86DRM_MODE)
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index c886ed0..d247db6 100644
--- src/radeon_textured_video.c
+++ src/radeon_textured_video.c
@@ -248,7 +248,11 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
BoxRec dstBox;
int dst_width = width, dst_height = height;
int aligned_height;
+#ifdef XF86DRM_MODE
int h_align = drmmode_get_height_align(pScrn, 0);
+#else
+ int h_align = 1;
+#endif
/* make the compiler happy */
s2offset = s3offset = srcPitch2 = 0;
--
cgit v0.8.3-6-g21f6