summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2012-03-09 01:10:27 +0200
committerMart Raudsepp <leio@gentoo.org>2012-03-09 01:10:27 +0200
commitb6316b3ed8f0099a6facec1fd31fddcdcc25902d (patch)
tree7714ab77bee4a272fbaf664815d4611b6a39fbd6 /x11-base/xorg-server/files
parentRemove ancient xorg-server-1.4 version (diff)
downloadloongson-b6316b3ed8f0099a6facec1fd31fddcdcc25902d.tar.gz
loongson-b6316b3ed8f0099a6facec1fd31fddcdcc25902d.tar.bz2
loongson-b6316b3ed8f0099a6facec1fd31fddcdcc25902d.zip
Remove ancient xorg-server-1.5 version
Diffstat (limited to 'x11-base/xorg-server/files')
-rw-r--r--x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch12
-rw-r--r--x11-base/xorg-server/files/1.4-fpic-libxf86config.patch13
-rw-r--r--x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch19
-rw-r--r--x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch38
-rw-r--r--x11-base/xorg-server/files/1.5.3-builtin-fonts.patch28
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch51
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch51
7 files changed, 0 insertions, 212 deletions
diff --git a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch b/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
deleted file mode 100644
index cdc436e..0000000
--- a/x11-base/xorg-server/files/1.4-fix-kdrive-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
-index 5803644..71d3403 100644
---- a/hw/kdrive/Makefile.am
-+++ b/hw/kdrive/Makefile.am
-@@ -1,6 +1,5 @@
- if KDRIVEVESA
--VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
-- smi via
-+VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 smi via
- endif
-
- if BUILD_KDRIVEFBDEVLIB
diff --git a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch b/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
deleted file mode 100644
index c3b9ebd..0000000
--- a/x11-base/xorg-server/files/1.4-fpic-libxf86config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
-index 849ee8b..1b49d48 100644
---- a/hw/xfree86/parser/Makefile.am
-+++ b/hw/xfree86/parser/Makefile.am
-@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
- DRI.c \
- Extensions.c
-
--AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
-+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC
-
- EXTRA_DIST = \
- Configint.h \
diff --git a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
deleted file mode 100644
index 2d0f469..0000000
--- a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=235789
-2008-09-09 Martin von Gagern
-
---- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h 2008-09-09 17:24:59.000000000 +0200
-+++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h 2008-09-09 18:01:53.000000000 +0200
-@@ -67,6 +67,13 @@
- #include "os.h"
- #endif
-
-+#ifndef IF_MASK
-+#define IF_MASK X86_EFLAGS_IF
-+#endif
-+#ifndef IOPL_MASK
-+#define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- typedef unsigned char U8;
- typedef unsigned short U16;
- typedef unsigned int U32;
diff --git a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch b/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
deleted file mode 100644
index ffb3e0d..0000000
--- a/x11-base/xorg-server/files/1.5.2-force-LC_ALL-C-when-running-awk.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8918c50440de301887af8006f2dc72d64adf9f9c Mon Sep 17 00:00:00 2001
-From: Remi Cardona <remi@gentoo.org>
-Date: Sat, 18 Oct 2008 12:23:51 +0200
-Subject: [PATCH] force LC_ALL=C when running awk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-This bug was reported by a user trying to build the server with a
-Turkish locale (tr_TR). The problem is that the Turkish alphabet is
-latin-based, but not entirely similar. The bug comes from vesamodes
-which has "Interlaced", which is then converted to lowercase by
-modelines2c.awk. Execept that with a Turkish locale
-tolower("Interlaced") is not "interlaced" but "─▒nterlaced", which the
-rest of the script fails to understand.
-
-This patch forces LC_ALL=C when running the awk script to always get the
-intended latin en_US alphabet.
----
- hw/xfree86/common/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
-index 0f44075..723973a 100644
---- a/hw/xfree86/common/Makefile.am
-+++ b/hw/xfree86/common/Makefile.am
-@@ -24,7 +24,7 @@ BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
- MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes
-
- xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES)
-- cat $(MODEDEFSOURCES) | $(AWK) -f $(srcdir)/modeline2c.awk > $@
-+ cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@
-
- BUILT_SOURCES = xf86DefModeSet.c
-
---
-1.6.0.2
-
diff --git a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch b/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
deleted file mode 100644
index 50719ad..0000000
--- a/x11-base/xorg-server/files/1.5.3-builtin-fonts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fe82a1fe634a2e0ceb030de90309d26044c7b75e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 1 Nov 2007 15:06:17 -0400
-Subject: [PATCH] Enable builtin font FPE.
-
----
- dix/dixfonts.c | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index c21b3ec..c951b05 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1890,11 +1890,8 @@ InitFonts (void)
- } else
- #endif
- {
--#ifdef BUILTIN_FONTS
- BuiltinRegisterFpeFunctions();
--#else
- FontFileRegisterFpeFunctions();
--#endif
- #ifndef NOFONTSERVERACCESS
- fs_register_fpe_functions();
- #endif
---
-1.5.3.4
-
diff --git a/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch
deleted file mode 100644
index 9c48b37..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.5.2-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
-+ extern unsigned int IOPortBase;
- #endif
-
- if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- }
- close(fd);
--#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,
-+ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+ 0x1fd00000);
-+ if (IOPortBase == MAP_FAILED) {
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+ strerror(errno));
-+ return FALSE;
-+ }
-+ close(fd);
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: map iobase (%x)\n",
-+ IOPortBase);
-+#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");
diff --git a/x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch b/x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch
deleted file mode 100644
index 9c48b37..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.5.3-loongson.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h xorg-server-1.1.1/hw/xfree86/dri/sarea.h
---- xorg-server-1.1.1.orig/hw/xfree86/dri/sarea.h 2006-07-06 02:31:40.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/dri/sarea.h 2007-02-01 14:23:47.000000000 +0800
-@@ -44,6 +44,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
-diff -urN xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c
---- xorg-server-1.1.1.orig/hw/xfree86/os-support/linux/lnx_video.c 2007-02-28 21:14:05.000000000 +0800
-+++ xorg-server-1.1.1/hw/xfree86/os-support/linux/lnx_video.c 2007-02-01 12:29:26.000000000 +0800
-@@ -540,9 +540,10 @@
- _X_EXPORT Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
-+ extern unsigned int IOPortBase;
- #endif
-
- if (ExtendedEnabled)
-@@ -569,7 +570,22 @@
- #endif
- }
- close(fd);
--#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,
-+ PROT_READ | PROT_WRITE, MAP_SHARED, fd,
-+ 0x1fd00000);
-+ if (IOPortBase == MAP_FAILED) {
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: Failed to map iobase (%s)\n",
-+ strerror(errno));
-+ return FALSE;
-+ }
-+ close(fd);
-+ xf86Msg(X_WARNING,
-+ "xf86EnableIOPorts: map iobase (%x)\n",
-+ IOPortBase);
-+#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");