summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Le <r0bertz@gentoo.org>2007-10-18 12:15:28 +0800
committerZhang Le <r0bertz@gentoo.org>2007-10-18 12:15:28 +0800
commit78b0a5e96da00a1b5a8b42dba57aeb5be7f8a229 (patch)
tree916cf9229316194d528abcd31fdf5b925a570c05 /x11-base
parentadd xorg-server-1.4-r2.ebuild (diff)
downloadloongson-78b0a5e96da00a1b5a8b42dba57aeb5be7f8a229.tar.gz
loongson-78b0a5e96da00a1b5a8b42dba57aeb5be7f8a229.tar.bz2
loongson-78b0a5e96da00a1b5a8b42dba57aeb5be7f8a229.zip
fix xorg-server-1.4-loongson.patch
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/Manifest8
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.4-loongson.patch4
2 files changed, 6 insertions, 6 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index da6dfcf..90815dc 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -150,10 +150,10 @@ AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037
MD5 eb8a89c732436e561035fc866162eedb files/xorg-server-1.3.0.0-loongson.patch 1931
RMD160 cc84def06fdfa7099342411baa037529166f56c0 files/xorg-server-1.3.0.0-loongson.patch 1931
SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90 files/xorg-server-1.3.0.0-loongson.patch 1931
-AUX xorg-server-1.4-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90
-MD5 eb8a89c732436e561035fc866162eedb files/xorg-server-1.4-loongson.patch 1931
-RMD160 cc84def06fdfa7099342411baa037529166f56c0 files/xorg-server-1.4-loongson.patch 1931
-SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90 files/xorg-server-1.4-loongson.patch 1931
+AUX xorg-server-1.4-loongson.patch 2039 RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 SHA1 828246c5fdd34f6018c3fab8654ce9e095142608 SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5
+MD5 c6ccb07c8003044f300b00959267d6f1 files/xorg-server-1.4-loongson.patch 2039
+RMD160 9ae834b71e29de0fd9698843833dcf967a4385f6 files/xorg-server-1.4-loongson.patch 2039
+SHA256 c875ede2906969d0c6cb2f9b5548f9002a93f25f174d82e013c8310697265cf5 files/xorg-server-1.4-loongson.patch 2039
AUX xorg-server-sam225bw-quirks.patch 380 RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 SHA1 20bae2bbe682b23feec54fdca23dde3598bab423 SHA256 7ad46b36407256b426a22b78f1646ffbc4f0197af49b068fdb5e56455cae2517
MD5 40692dd1eba5bf76e835a955a54b5b7b files/xorg-server-sam225bw-quirks.patch 380
RMD160 c4f7729a9f042e881feafcb5b0f97b05c80ab667 files/xorg-server-sam225bw-quirks.patch 380
diff --git a/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
index 04ee66e..9c48b37 100644
--- a/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
+++ b/x11-base/xorg-server/files/xorg-server-1.4-loongson.patch
@@ -29,7 +29,7 @@ diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-se
#endif
}
close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
+#elif defined(__mips__)
+ fd = open("/dev/mem", O_RDWR);
+ IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
@@ -45,7 +45,7 @@ diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-se
+ xf86Msg(X_WARNING,
+ "xf86EnableIOPorts: map iobase (%x)\n",
+ IOPortBase);
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");