Support older X servers for RHEL5

7 files changed, 28 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index f94dafd..ae47dae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,13 +44,6 @@ AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-
-XORG_MACROS_VERSION(1.8)
-XORG_DEFAULT_OPTIONS
-
 # Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -87,7 +80,7 @@ XORG_DRIVER_CHECK_EXT(XF86DRI, xextproto x11)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto libdrm $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto libdrm glproto $REQUIRED_MODULES])
 PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
  HAVE_XEXTPROTO_71="no")
@@ -179,6 +172,7 @@ AC_DEFINE(X_NEED_I2CSTART,1,[Compatibility define for older Xen])
 DRIVER_MAN_SUFFIX="4"
 AC_SUBST([DRIVER_MAN_SUFFIX])
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([
diff --git a/src/Makefile.am b/src/Makefile.am
index b46a8c5..9bac9e9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = version.h
 CONFIG_CLEAN_FILES= version.h
 AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @DRI_CFLAGS@
 openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
-openchrome_drv_la_LDFLAGS = -module -avoid-version
+openchrome_drv_la_LDFLAGS = -module -avoid-version @LIBUDEV_LIBS@
 openchrome_drv_ladir = @moduledir@/drivers
 
 openchrome_drv_la_SOURCES = \
diff --git a/src/via_display.c b/src/via_display.c
index aaf4267..267a9c1 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1225,7 +1225,9 @@ static const xf86CrtcFuncsRec iga1_crtc_funcs = {
     .show_cursor            = iga1_crtc_show_cursor,
     .hide_cursor            = iga1_crtc_hide_cursor,
     .load_cursor_argb       = iga_crtc_load_cursor_argb,
+#ifdef RANDR_12_INTERFACE
     .set_origin             = iga1_crtc_set_origin,
+#endif
     .destroy                = iga_crtc_destroy,
 };
 
@@ -1630,7 +1632,9 @@ static const xf86CrtcFuncsRec iga2_crtc_funcs = {
     .show_cursor            = iga2_crtc_show_cursor,
     .hide_cursor            = iga2_crtc_hide_cursor,
     .load_cursor_argb       = iga_crtc_load_cursor_argb,
+#ifdef RANDR_12_INTERFACE
     .set_origin             = iga2_crtc_set_origin,
+#endif
     .destroy                = iga_crtc_destroy,
 };
 
diff --git a/src/via_exa.c b/src/via_exa.c
index 94cab09..d78a770 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -36,6 +36,9 @@
 #include <X11/Xarch.h>
 #include "miline.h"
 
+#include <GL/gl.h>
+#include <sys/mman.h>
+
 #include "via_driver.h"
 #include "via_regs.h"
 #include "via_dmabuffer.h"
diff --git a/src/via_lvds.c b/src/via_lvds.c
index b71129a..d7d8225 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -298,6 +298,7 @@ via_lvds_create_resources(xf86OutputPtr output)
 {
 }
 
+#ifdef RANDR_12_INTERFACE
 static Bool
 via_lvds_set_property(xf86OutputPtr output, Atom property,
 						RRPropertyValuePtr value)
@@ -310,6 +311,7 @@ via_lvds_get_property(xf86OutputPtr output, Atom property)
 {
     return FALSE;
 }
+#endif
 
 static void
 ViaLCDPowerSequence(vgaHWPtr hwp, VIALCDPowerSeqRec Sequence)
@@ -1435,8 +1437,10 @@ via_lvds_destroy(xf86OutputPtr output)
 
 static const xf86OutputFuncsRec via_lvds_funcs = {
     .create_resources   = via_lvds_create_resources,
+#ifdef RANDR_12_INTERFACE
     .set_property       = via_lvds_set_property,
     .get_property       = via_lvds_get_property,
+#endif
     .dpms               = via_lvds_dpms,
     .save               = via_lvds_save,
     .restore            = via_lvds_restore,
diff --git a/src/via_memmgr.h b/src/via_memmgr.h
index 933c88b..b1b625c 100644
--- a/src/via_memmgr.h
+++ b/src/via_memmgr.h
@@ -22,6 +22,8 @@
  */
 #ifndef _VIA_MEMMGR_H_
 #define _VIA_MEMMGR_H_
+
+#include <sys/mman.h>
 #include "xf86.h"
 
 #define TTM_PL_FLAG_SYSTEM	1
diff --git a/src/via_outputs.c b/src/via_outputs.c
index c07b1d2..c781a03 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -161,6 +161,7 @@ via_tv_create_resources(xf86OutputPtr output)
 {
 }
 
+#ifdef RANDR_12_INTERFACE
 static Bool
 via_tv_set_property(xf86OutputPtr output, Atom property,
 					RRPropertyValuePtr value)
@@ -173,6 +174,7 @@ via_tv_get_property(xf86OutputPtr output, Atom property)
 {
     return FALSE;
 }
+#endif
 
 static void
 via_tv_dpms(xf86OutputPtr output, int mode)
@@ -369,8 +371,10 @@ via_tv_destroy(xf86OutputPtr output)
 
 static const xf86OutputFuncsRec via_tv_funcs = {
     .create_resources   = via_tv_create_resources,
+#ifdef RANDR_12_INTERFACE
     .set_property       = via_tv_set_property,
     .get_property       = via_tv_get_property,
+#endif
     .dpms               = via_tv_dpms,
     .save               = via_tv_save,
     .restore            = via_tv_restore,
@@ -498,6 +502,7 @@ via_dp_create_resources(xf86OutputPtr output)
 {
 }
 
+#ifdef RANDR_12_INTERFACE
 static Bool
 via_dp_set_property(xf86OutputPtr output, Atom property,
 						RRPropertyValuePtr value)
@@ -510,6 +515,7 @@ via_dp_get_property(xf86OutputPtr output, Atom property)
 {
     return FALSE;
 }
+#endif
 
 static void
 via_dp_dpms(xf86OutputPtr output, int mode)
@@ -609,8 +615,10 @@ via_dp_destroy(xf86OutputPtr output)
 
 static const xf86OutputFuncsRec via_dp_funcs = {
     .create_resources   = via_dp_create_resources,
+#ifdef RANDR_12_INTERFACE
     .set_property       = via_dp_set_property,
     .get_property       = via_dp_get_property,
+#endif
     .dpms               = via_dp_dpms,
     .save               = via_dp_save,
     .restore            = via_dp_restore,
@@ -669,6 +677,7 @@ via_analog_create_resources(xf86OutputPtr output)
 {
 }
 
+#ifdef RANDR_12_INTERFACE
 static Bool
 via_analog_set_property(xf86OutputPtr output, Atom property,
 						RRPropertyValuePtr value)
@@ -681,6 +690,7 @@ via_analog_get_property(xf86OutputPtr output, Atom property)
 {
     return FALSE;
 }
+#endif
 
 static void
 via_analog_dpms(xf86OutputPtr output, int mode)
@@ -818,8 +828,10 @@ via_analog_destroy(xf86OutputPtr output)
 
 static const xf86OutputFuncsRec via_analog_funcs = {
     .create_resources	= via_analog_create_resources,
+#ifdef RANDR_12_INTERFACE
     .set_property       = via_analog_set_property,
     .get_property       = via_analog_get_property,
+#endif
     .dpms               = via_analog_dpms,
     .save               = via_analog_save,
     .restore            = via_analog_restore,