Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/driver/xf86-video-mga/22993389.patch
author henryzh <henry.zhao@oracle.com>
Tue, 03 May 2016 12:08:34 -0700
changeset 1631 4f761c384e9b
permissions -rw-r--r--
22993744 mga driver core dump after enabling EXA 22993389 S12: mga driver not linked with EXA module in later builds
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1631
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     1
 
diff --git a/configure.ac b/configure.ac
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     2
 
index b770c88..94abea4 100644
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     3
 
--- a/configure.ac
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     4
 
+++ b/configure.ac
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     5
 
@@ -1,3 +1,6 @@
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     6
 
+#
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     7
 
+#  Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     8
 
+#
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
     9
 
 #  Copyright 2005 Adam Jackson.
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    10
 
 #
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    11
 
 #  Permission is hereby granted, free of charge, to any person obtaining a
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    12
 
@@ -156,7 +159,8 @@ if test "x$EXA" = xyes; then
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    13
 
     SAVE_CPPFLAGS="$CPPFLAGS"
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    14
 
     CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    15
 
     AC_CHECK_HEADER(exa.h,
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    16
 
-                   [have_exa_h="yes"], [have_exa_h="no"])
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    17
 
+                   [have_exa_h="yes"], [have_exa_h="no"],
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    18
 
+		    [#include "xorg-server.h"])
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    19
 
     CPPFLAGS="$SAVE_CPPFLAGS"
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    20
 
 else
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    21
 
     AC_MSG_RESULT(no)
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    22
 
@@ -167,6 +171,7 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    23
 
 if test "x$have_exa_h" = xyes; then
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    24
 
     AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    25
 
     AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    26
 
+#include "xorg-server.h"
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    27
 
 #include "exa.h"
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    28
 
 #if EXA_VERSION_MAJOR < 2
4f761c384e9b 22993744 mga driver core dump after enabling EXA
henryzh <henry.zhao@oracle.com>
parents:
diff changeset 
    29
 
 #error OLD EXA!
upstream/oracle/x-cons/x-s12-clone