diff options
Diffstat (limited to 'x11-misc/i855crt/files')
-rw-r--r-- | x11-misc/i855crt/files/i855crt-0.4-makefile.patch | 16 | ||||
-rw-r--r-- | x11-misc/i855crt/files/i855crt-i915support.diff | 70 |
2 files changed, 0 insertions, 86 deletions
diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch deleted file mode 100644 index e7deffb4d30a..000000000000 --- a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,11 +1,6 @@ --i855crt: i855crt.o vmodes.o -- gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext -lXv -+LDLIBS = -lXv -lX11 - --i855crt.o: i855crt.c i855crt.h vmodes.h hw.h -- gcc $(CFLAGS) -c i855crt.c -- --vmodes.o: vmodes.c vmodes.h -- gcc $(CFLAGS) -c vmodes.c -+i855crt: vmodes.o - - clean: - rm *.o -f diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff deleted file mode 100644 index 5aea3a7dd96c..000000000000 --- a/x11-misc/i855crt/files/i855crt-i915support.diff +++ /dev/null @@ -1,70 +0,0 @@ ---- a/dumpreg.c -+++ b/dumpreg.c -@@ -36,10 +36,11 @@ - (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL || - (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL || - (p = strstr(*buff_ptr, I810_IGSTR)) != NULL || -- (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL; -+ (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL || - (p = strstr(*buff_ptr, I830STR)) != NULL || - (p = strstr(*buff_ptr, I845STR)) != NULL || -- (p = strstr(*buff_ptr, I865STR)) != NULL ; -+ (p = strstr(*buff_ptr, I865STR)) != NULL || -+ (p = strstr(*buff_ptr, I915STR)) != NULL ; - - if(i) - { -@@ -89,7 +90,7 @@ - chip = i810_chip(&buff, &len, pci_f); - if (chip == NULL) - { -- fprintf(stderr, "No know videocard has been found.\n"); -+ fprintf(stderr, "No known videocard has been found.\n"); - exit(1); - } - pclose(pci_f); ---- a/i855crt.c -+++ b/i855crt.c -@@ -254,14 +254,15 @@ - (p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL || - (p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL || - (p = strstr(*buff_ptr, I810_IGSTR)) != NULL || -- (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL; -+ (p = strstr(*buff_ptr, I810_CFCSTR)) != NULL || - (p = strstr(*buff_ptr, I830STR)) != NULL || - (p = strstr(*buff_ptr, I845STR)) != NULL || -- (p = strstr(*buff_ptr, I865STR)) != NULL ; -+ (p = strstr(*buff_ptr, I865STR)) != NULL || -+ (p = strstr(*buff_ptr, I915STR)) != NULL ; - - if(i) - { -- fprintf(stderr,"This driver is untested with your videocard !\n"); -+ fprintf(stderr,"This driver is untested with your video card !\n"); - return p; - } - -@@ -493,7 +494,7 @@ - chip = i810_chip(&buff, &len, pci_f); - if (chip == NULL) - { -- fprintf(stderr, "No know videocard has been found.\n"); -+ fprintf(stderr, "No known videocard has been found.\n"); - exit(1); - } - pclose(pci_f); ---- a/i855crt.h -+++ b/i855crt.h -@@ -1,3 +1,4 @@ -+ - /* - * This is part of the source for i855crt driver - * copyright(c) Merello Andrea 2004 -@@ -45,6 +46,7 @@ - #define I845STR "8086:2562" - #define I855STR "8086:3582" - #define I865STR "8086:2572" -+#define I915STR "8086:2592" - #define MEMSTR "Memory at" - #define NONPRSTR "32-bit, non-prefetchable" - |