diff options
| author | kwm <kwm@FreeBSD.org> | 2011-07-19 23:18:31 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2011-07-19 23:18:31 +0800 |
| commit | c3d75484803e2a5251d2fa785a2b8bf19346cd7c (patch) | |
| tree | bbfaf217e3f28352b20fc5e65d7832c559eda11e /x11-drivers | |
| parent | aa61ca9b9331dc824cbbb1a1958f39ba3ef363bb (diff) | |
| download | freebsd-ports-gnome-c3d75484803e2a5251d2fa785a2b8bf19346cd7c.tar.gz freebsd-ports-gnome-c3d75484803e2a5251d2fa785a2b8bf19346cd7c.tar.zst freebsd-ports-gnome-c3d75484803e2a5251d2fa785a2b8bf19346cd7c.zip | |
Update to 6.14.2.
PR: ports/157572 (based on)
Submitted by: Warren Block <wblock@wonkity.com>
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/xf86-video-ati/Makefile | 3 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/distinfo | 4 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-ati/files/patch-ums | 42 |
3 files changed, 3 insertions, 46 deletions
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index 9ee72e21e6e7..02986dec8fb0 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -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 diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo index 6c0c57497ba2..1fe6ed6ca04c 100644 --- a/x11-drivers/xf86-video-ati/distinfo +++ b/x11-drivers/xf86-video-ati/distinfo @@ -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 diff --git a/x11-drivers/xf86-video-ati/files/patch-ums b/x11-drivers/xf86-video-ati/files/patch-ums deleted file mode 100644 index 854c4eb2218c..000000000000 --- a/x11-drivers/xf86-video-ati/files/patch-ums +++ /dev/null @@ -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 |