From cg@babasse.net  Sun Apr  7 15:27:39 2013
Return-Path: <cg@babasse.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 056DB92F;
	Sun,  7 Apr 2013 15:27:39 +0000 (UTC)
	(envelope-from cg@babasse.net)
Received: from sulfateuse.babasse.net (unknown [IPv6:2001:7a8:580e:2::3])
	by mx1.freebsd.org (Postfix) with ESMTP id 10EF6175;
	Sun,  7 Apr 2013 15:27:37 +0000 (UTC)
Received: from blackbox.babasse.net (sulfateuse.babasse.net [192.168.254.129])
	by sulfateuse.babasse.net (8.14.6/8.14.6) with ESMTP id r37FRPqQ022872;
	Sun, 7 Apr 2013 17:27:25 +0200 (CEST)
	(envelope-from cg@babasse.net)
Received: from blackbox.babasse.net (localhost [127.0.0.1])
	by blackbox.babasse.net (8.14.6/8.14.6) with ESMTP id r37FRPpw022869;
	Sun, 7 Apr 2013 17:27:25 +0200 (CEST)
	(envelope-from cg@blackbox.babasse.net)
Received: (from cg@localhost)
	by blackbox.babasse.net (8.14.6/8.14.6/Submit) id r37FRPZa022868;
	Sun, 7 Apr 2013 17:27:25 +0200 (CEST)
	(envelope-from cg)
Message-Id: <201304071527.r37FRPZa022868@blackbox.babasse.net>
Date: Sun, 7 Apr 2013 17:27:25 +0200 (CEST)
From: Cyril Guibourg <aragorn+ports@babasse.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: x11@FreeBSD.org
Subject: [PATCH] x11-drivers/xf86-video-openchrome: update to 0.2.906
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         177691
>Category:       ports
>Synopsis:       [PATCH] x11-drivers/xf86-video-openchrome: update to 0.2.906
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-x11
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 07 15:30:01 UTC 2013
>Closed-Date:    Wed Jun 26 19:51:20 UTC 2013
>Last-Modified:  Wed Jun 26 19:51:20 UTC 2013
>Originator:     Cyril Guibourg
>Release:        FreeBSD 9.1-STABLE i386
>Organization:
Home sweet home
>Environment:
System: FreeBSD blackbox.babasse.net 9.1-STABLE FreeBSD 9.1-STABLE #1: Mon Mar 18 21:26:38 CET 2013
>Description:
- Update to 0.2.906

solves PR 175629

Port maintainer (x11@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_7 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- xf86-video-openchrome-0.2.906.patch begins here ---
diff -ruN /usr/ports/x11-drivers/xf86-video-openchrome/Makefile ./Makefile
--- /usr/ports/x11-drivers/xf86-video-openchrome/Makefile	2012-11-17 07:03:25.000000000 +0100
+++ ./Makefile	2013-04-07 17:03:06.000000000 +0200
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	xf86-video-openchrome
-# Date Created:				17 Sep 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
+# Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD: ports/x11-drivers/xf86-video-openchrome/Makefile,v 1.23 2012/11/17 06:03:25 svnexp Exp $
 #
 
 PORTNAME=	xf86-video-openchrome
-PORTVERSION=	0.2.904
-PORTREVISION=	3
+PORTVERSION=	0.2.906
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://www.openchrome.org/releases/
 
@@ -15,10 +11,11 @@
 COMMENT=	X.Org openChrome display driver
 
 USE_GL=		gl
+USE_LDCONFIG=	yes
 
 XORG_CAT=	driver
 USE_XORG=	videoproto xf86driproto xextproto xvmc glproto
-MAN4=		openchrome.4x
+MAN4=		openchrome.4
 
 MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 
diff -ruN /usr/ports/x11-drivers/xf86-video-openchrome/distinfo ./distinfo
--- /usr/ports/x11-drivers/xf86-video-openchrome/distinfo	2013-04-06 20:36:28.000000000 +0200
+++ ./distinfo	2013-04-07 11:39:37.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
-SIZE (xorg/driver/xf86-video-openchrome-0.2.904.tar.bz2) = 460051
+SHA256 (xorg/driver/xf86-video-openchrome-0.2.906.tar.bz2) = e7558edc144a08371493432014a7b88ee26ec35d00ef96f2ea24bd7872b0ff41
+SIZE (xorg/driver/xf86-video-openchrome-0.2.906.tar.bz2) = 514154
diff -ruN /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-configure ./files/patch-configure
--- /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-configure	2008-01-11 13:49:29.000000000 +0100
+++ ./files/patch-configure	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- configure.orig	2008-01-02 15:05:04.000000000 -0500
-+++ configure	2008-01-10 20:48:21.000000000 -0500
-@@ -21484,7 +21484,7 @@
- _ACEOF
- 
- 
--DRIVER_MAN_SUFFIX="4"
-+DRIVER_MAN_SUFFIX="4x"
- 
- 
- 
diff -ruN /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c ./files/patch-src__via_vgahw.c
--- /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-src__via_vgahw.c	2012-04-21 19:03:27.000000000 +0200
+++ ./files/patch-src__via_vgahw.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
---- src/via_vgahw.c.orig	2009-10-03 22:48:55.000000000 +0200
-+++ src/via_vgahw.c	2012-02-08 10:43:08.000000000 +0100
-@@ -36,6 +36,11 @@
- #include "via_driver.h" /* for HAVE_DEBUG */
- #include "via_vgahw.h"
- 
-+#if ABI_VIDEODRV_VERSION < 12
-+#define PIOOFFSET hwp->PIOOffset
-+#else
-+#define PIOOFFSET 0
-+#endif
- 
- static CARD8
- ViaVgahwIn(vgaHWPtr hwp, int address)
-@@ -43,7 +48,7 @@
-     if (hwp->MMIOBase)
-         return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
-     else
--        return inb(hwp->PIOOffset + address);
-+        return inb(PIOOFFSET + address);
- }
- 
- static void
-@@ -52,7 +57,7 @@
-     if (hwp->MMIOBase)
-         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
-     else
--        outb(hwp->PIOOffset + address, value);
-+        outb(PIOOFFSET + address, value);
- }
- 
- /*
diff -ruN /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c ./files/patch-src__via_video.c
--- /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-src__via_video.c	2012-04-21 19:03:27.000000000 +0200
+++ ./files/patch-src__via_video.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-Fix Xvideo crash in X.org server 1.10
-
-http://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=cd753845e02466b81f426793e4f5619afab05d82
-
---- src/via_video.c.orig	2012-02-08 10:13:54.000000000 +0100
-+++ src/via_video.c	2012-02-08 10:14:33.000000000 +0100
-@@ -763,67 +763,6 @@
-     return 0;
- }
- 
--
--/*
-- * This one gets called, for example, on panning.
-- */
--
--static int
--viaReputImage(ScrnInfoPtr pScrn,
--        short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
--        DrawablePtr pDraw)
--{
--
--    DDUPDATEOVERLAY UpdateOverlay_Video;
--    LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
--    viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
--    VIAPtr pVia = VIAPTR(pScrn);
--
--    if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
--        REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
--        if (pPriv->autoPaint) {
--            if (pDraw->type == DRAWABLE_WINDOW) {
--                viaPaintColorkey(pScrn, pPriv, clipBoxes, pDraw);
--            } else {
--                xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
--                    clipBoxes);
--            }
--        }
--    }
--
--    if (drw_x == pPriv->old_drw_x &&
--        drw_y == pPriv->old_drw_y &&
--        pVia->swov.oldPanningX == pVia->swov.panning_x &&
--        pVia->swov.oldPanningY == pVia->swov.panning_y) {
--        viaXvError(pScrn, pPriv, xve_none);
--        return Success;
--    }
--
--    lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
--    lpUpdateOverlay->SrcTop = pPriv->old_src_y;
--    lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
--    lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
--
--    lpUpdateOverlay->DstLeft = drw_x;
--    lpUpdateOverlay->DstTop = drw_y;
--    lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
--    lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
--    pPriv->old_drw_x = drw_x;
--    pPriv->old_drw_y = drw_y;
--
--    lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
--
--    if (pScrn->bitsPerPixel == 8)
--        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
--    else
--        lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
--
--    VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
--
--    viaXvError(pScrn, pPriv, xve_none);
--    return Success;
--}
--
- static unsigned
- viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
- {
-@@ -884,7 +823,7 @@
-         viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
-         viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
-         viaAdaptPtr[i]->PutImage = viaPutImage;
--        viaAdaptPtr[i]->ReputImage = viaReputImage;
-+        viaAdaptPtr[i]->ReputImage = NULL;
-         viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
-         for (j = 0; j < numPorts; ++j) {
-             viaPortPriv[j].dmaBounceBuffer = NULL;
diff -ruN /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c ./files/patch-src_via_id.c
--- /usr/ports/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c	2009-01-24 23:06:27.000000000 +0100
+++ ./files/patch-src_via_id.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- src/via_id.c.orig	2008-08-18 18:25:16.000000000 -0400
-+++ src/via_id.c	2008-11-11 21:20:14.000000000 -0500
-@@ -207,6 +207,7 @@
-     {"VIA VT3343 (P4M890)",                   VIA_P4M890,  0x1106, 0x3343, VIA_DEVICE_CRT},
-     {"MSI P4M890M-L/IL (MS-7255)",            VIA_P4M890,  0x1462, 0x7255, VIA_DEVICE_CRT},
-     {"Biostar P4M890-M7 TE",                  VIA_P4M890,  0x1565, 0x1207, VIA_DEVICE_CRT},
-+    {"Mitac 8624 (Joybook R41E)",             VIA_P4M890,  0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
-     {"ASRock P4VM890",                        VIA_P4M890,  0x1849, 0x3343, VIA_DEVICE_CRT},
- 
-     /* keep this */
--- xf86-video-openchrome-0.2.906.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-x11 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Apr 7 15:30:10 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177691 

Date: Sun, 07 Apr 2013 22:27:41 +0200
From: Niclas Zeising <zeising@freebsd.org>
To: Cyril Guibourg <aragorn+ports@babasse.net>
Cc: FreeBSD-gnats-submit@freebsd.org, x11@FreeBSD.org
Subject: Re: [PATCH] x11-drivers/xf86-video-openchrome: update to 0.2.906

 Hi!
 There is an update to xf86-video-openchrome in the xorg development repo
 and the update patch that has been sent out.  Please test that update
 instead.
 The plan is to merge this xorg update some time after FreeBSD 8.4 is
 released.
 Regards!
 -- 
 Niclas
State-Changed-From-To: open->closed 
State-Changed-By: zeising 
State-Changed-When: Wed Jun 26 19:51:18 UTC 2013 
State-Changed-Why:  
Updated as part of the xorg update.  Closing. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177691 
>Unformatted:
