repositories
/
deb_xorg-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ODROID-U3 xorg-server debian package fork :
[deb_xorg-server.git]
/
debian
/
patches
/
111_armel-drv-fallbacks.patch
diff --git
a/debian/patches/111_armel-drv-fallbacks.patch
b/debian/patches/111_armel-drv-fallbacks.patch
index bc76c4eec6bcb3a113c163df4c477445f209c249..ccbbdc46465f07ad7f4411e11f197c37971643ab 100644
(file)
--- a/
debian/patches/111_armel-drv-fallbacks.patch
+++ b/
debian/patches/111_armel-drv-fallbacks.patch
@@
-1,5
+1,3
@@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
-index 55412b4..d4a95d2 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -45,6 +45,12 @@
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -45,6 +45,12 @@
@@
-43,9
+41,9
@@
index 55412b4..d4a95d2 100644
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
static void
listPossibleVideoDrivers(char *matches[], int nmatches)
{
-@@ -287,6 +314,21 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+@@ -279,6 +306,21 @@ listPossibleVideoDrivers(char *matches[]
+ i = xf86PciMatchDriver(matches, nmatches);
#endif
#endif
- }
+#if defined(__linux__) && defined(__arm__)
+ if (i < (nmatches - 1)) {
+#if defined(__linux__) && defined(__arm__)
+ if (i < (nmatches - 1)) {
@@
-65,11
+63,9
@@
index 55412b4..d4a95d2 100644
#if defined(__linux__)
matches[i++] = xnfstrdup("modesetting");
#endif
#if defined(__linux__)
matches[i++] = xnfstrdup("modesetting");
#endif
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 24b9473..0061c25 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -3
62,6 +36
2,14 @@ xf86platformProbeDev(DriverPtr drvp)
+@@ -3
72,6 +37
2,14 @@ xf86platformProbeDev(DriverPtr drvp)
if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
break;
}
if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
break;
}