recipes/xorg-driver/xf86-video-s3c64xx/0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch

   1 From 1311ff65283ed306bcac4b4b971e02144d65da6b Mon Sep 17 00:00:00 2001
   2 From: Koen Kooi <koen@dominion.thruhere.net>
   3 Date: Sat, 17 Apr 2010 10:50:38 +0200
   4 Subject: [PATCH 2/3] DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available.
   5
   6 ---
   7  configure.ac      |    4 ++++
   8  src/s3c64xx_lcd.c |    4 ++++
   9  2 files changed, 8 insertions(+), 0 deletions(-)
  10
  11 diff --git a/configure.ac b/configure.ac
  12 index c69218f..a9ec2f0 100644
  13 --- a/configure.ac
  14 +++ b/configure.ac
  15 @@ -58,6 +58,10 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
  16  # Checks for pkg-config packages
  17  PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
  18  sdkdir=$(pkg-config --variable=sdkdir xorg-server)
  19 +PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
  20 +                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
  21 +                  HAVE_XEXTPROTO_71="no")
  22 +AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
  23
  24  AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
  25  if test "x$PCIACCESS" = xyes; then
  26 diff --git a/src/s3c64xx_lcd.c b/src/s3c64xx_lcd.c
  27 index 5200f60..02627ae 100644
  28 --- a/src/s3c64xx_lcd.c
  29 +++ b/src/s3c64xx_lcd.c
  30 @@ -53,8 +53,12 @@
  31
  32  #include "s3c64xx.h"
  33
  34 +#ifdef HAVE_XEXTPROTO_71
  35 +#include <X11/extensions/dpmsconst.h>
  36 +#else
  37  #define DPMS_SERVER
  38  #include "X11/extensions/dpms.h"
  39 +#endif
  40
  41  enum OutputTypes  {
  42     S3C_OUTPUT_LCD,
  43 --
  44 1.6.6.1
  45