[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-nouveau: Changes to 'debian-unstable'



 debian/patches/02-drm-nouveau-newabi.patch |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 860471c98557a538a7bcd70183e6ed49113145b4
Author: Sven Joachim <svenjoac@gmx.de>
Date:   Thu May 24 14:45:44 2012 +0200

    Amend Maarten's hack by setting AC_SYS_LARGEFILE in configure.ac
    
    The driver does not need this, but the included libdrm_nouveau
    requires a 64-bit off_t.  With a 32-bit off_t, mmap in
    nouveau_bo_map() could easily fail since nvbo->map_handle is of type
    uint64_t.

diff --git a/debian/patches/02-drm-nouveau-newabi.patch b/debian/patches/02-drm-nouveau-newabi.patch
index 8179f9f..95ffce9 100644
--- a/debian/patches/02-drm-nouveau-newabi.patch
+++ b/debian/patches/02-drm-nouveau-newabi.patch
@@ -4,11 +4,24 @@ Date:   Wed May 23 09:29:29 2012 +0200
 
     awful hack to remove dependency on libdrm_nouveau
 
+[ Amendment by Sven Joachim <svenjoac@gmx.de>: Set AC_SYS_LARGEFILE
+  in configure.ac, required by the included libdrm_nouveau. ]
+
 diff --git a/configure.ac b/configure.ac
-index afb6cde..7326144 100644
+index afb6cde..233b4ba 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -67,7 +67,8 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+@@ -52,6 +52,9 @@ AC_DISABLE_STATIC
+ LT_INIT
+ AC_PROG_CC
+ 
++# not needed for the DDX, but by the included libdrm_nouveau
++AC_SYS_LARGEFILE
++
+ AH_TOP([#include "xorg-server.h"])
+ 
+ AC_ARG_WITH(xorg-module-dir,
+@@ -67,7 +70,8 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
  XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
  
  # Checks for pkg-config packages


Reply to: