[Unichrome-devel] xf86-video-unichrome master branch updated. (b917bee8)

[<li...@fr...>]

Reporting from xf86-video-unichrome: Main unichrome.sf.net repository

Please visit:
    http://cgit.freedesktop.org/~libv/xf86-video-unichrome
Or get your own copy by using:
    git-clone git://anongit.freedesktop.org/~libv/xf86-video-unichrome

The branch, master has been updated
       via b917bee dri: In the modular case include via_drm.h from default path.
       via 4977111 crtc/edid: Close fd before fd gets out of scope.
      from 3e2dd0a xorg: update to new XvReputImage API

Summary of changes:
 src/via_crt.c    |    2 ++
 src/via_memory.h |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

commit 4977111db4a7990873a38b1e2cf6c8aafe431d6f
Author: Egbert Eich <ei...@fr...>
Date:   Mon May 23 11:35:10 2011 +0200

    crtc/edid: Close fd before fd gets out of scope.
    
    Signed-off-by: Egbert Eich <ei...@fr...>

4977111db4a7990873a38b1e2cf6c8aafe431d6f
diff --git a/src/via_crt.c b/src/via_crt.c
index 6c79292..0429e5a 100644
--- a/src/via_crt.c
+++ b/src/via_crt.c
@@ -154,6 +154,8 @@ CRTGetOptions(struct ViaOutput *Output)
                             __func__, EDIDFileName, strerror(errno));
             else
                 Output->EDID = xf86InterpretEDID(Output->scrnIndex, Block);
+
+	    fclose(EDIDFile);
         }
     }
 

-----------------------------------------------------------------------

commit b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
Author: Egbert Eich <ei...@fr...>
Date:   Mon May 23 11:35:32 2011 +0200

    dri: In the modular case include via_drm.h from default path.
    
    This file is provided by libdrm. The correct path to it should be
    provided by the libdrm pkgconfig file already.
    The path has changed from <prefix>/include/drm to <prefix>/include/libdrm
    recently.
    
    Signed-off-by: Egbert Eich <ei...@fr...>

b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
diff --git a/src/via_memory.h b/src/via_memory.h
index e623969..8012fb1 100644
--- a/src/via_memory.h
+++ b/src/via_memory.h
@@ -30,7 +30,7 @@
 
 /* don't include local via_drm.h when using modular */
 #ifdef HAVE_CONFIG_H
-#include "drm/via_drm.h"
+#include <via_drm.h>
 #else
 #include "via_drm.h"
 #endif

-----------------------------------------------------------------------