Module Name: xsrc
Committed By: mrg
Date: Mon Nov 29 01:42:39 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i830_driver.c i830_dvo.c
Log Message:
apply the hack to avoid xf86LoaderReqSymLists() and LoaderRefSymLists().
should fix PR#44167.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c:1.3 Tue Nov 23 09:01:19 2010
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_driver.c Mon Nov 29 01:42:38 2010
@@ -214,6 +214,11 @@
#include <xf86drmMode.h>
#endif
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#else
+
#ifdef I830_USE_EXA
const char *I830exaSymbols[] = {
"exaGetVersion",
@@ -225,6 +230,7 @@
NULL
};
#endif
+#endif
#define BIT(x) (1 << (x))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
Index: xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c:1.1.1.2 Tue Jun 9 02:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i830_dvo.c Mon Nov 29 01:42:38 2010
@@ -38,6 +38,11 @@
#include "ch7xxx/ch7xxx.h"
#include "tfp410/tfp410.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) > 6
+#define xf86LoaderReqSymLists(...) do {} while (0)
+#define LoaderRefSymLists(...) do {} while (0)
+#endif
+
static const char *SIL164Symbols[] = {
"Sil164VidOutput",
NULL
