summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-06-30 03:27:01 +0000
committertnn <tnn@pkgsrc.org>2015-06-30 03:27:01 +0000
commitf2368df88598ced876440d2af89f8094a1a41c11 (patch)
tree7561b48620adb4a8cb0ba74a2ec317107be435ae /x11
parentc677644ce7dccd770e679df3f5470025051f62a5 (diff)
downloadpkgsrc-f2368df88598ced876440d2af89f8094a1a41c11.tar.gz
remove redundant patch, fixed in 1af15aaf278edcf6f6de94774350e34a80883c24
Diffstat (limited to 'x11')
-rw-r--r--x11/modular-xorg-server/distinfo3
-rw-r--r--x11/modular-xorg-server/patches/patch-include_servermd.h27
2 files changed, 1 insertions, 29 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index 0421896e8d8..275525e39a5 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2015/06/29 11:12:45 wiz Exp $
+$NetBSD: distinfo,v 1.61 2015/06/30 03:27:01 tnn Exp $
SHA1 (xorg-server-1.17.2.tar.bz2) = 56ac29a82b99bcf4c7ba2fca41a44cfa18748262
RMD160 (xorg-server-1.17.2.tar.bz2) = bf575a269f1e7b729992a20989be84e09fcc88a2
@@ -12,4 +12,3 @@ SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = f2c72562a40c0e3109991453a
SHA1 (patch-hw_xfree86_os-support_bsd_sparc64__video.c) = eddf15142e26f10f9028088f8e4e910bb6b5df59
SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 499e536a1189b88bc17e3df44a9ae2397decdc8b
SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
-SHA1 (patch-include_servermd.h) = 301a1cd902490b5512a430204e7a05eda8d9097f
diff --git a/x11/modular-xorg-server/patches/patch-include_servermd.h b/x11/modular-xorg-server/patches/patch-include_servermd.h
deleted file mode 100644
index f113104686f..00000000000
--- a/x11/modular-xorg-server/patches/patch-include_servermd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-include_servermd.h,v 1.2 2015/06/29 11:12:45 wiz Exp $
-
-Try to fix broken X_BYTE_ORDER handling for big endian.
-Probably broken here:
-http://cgit.freedesktop.org/xorg/xserver/commit/?id=4302484ef2e67b2e05756c7ee0834dce938f1b44
-
---- include/servermd.h.orig 2015-06-16 15:21:07.000000000 +0000
-+++ include/servermd.h
-@@ -54,10 +54,16 @@ SOFTWARE.
-
- #include <X11/Xarch.h> /* for X_LITTLE_ENDIAN/X_BIG_ENDIAN */
-
--#if X_BYTE_ORDER == X_LITTLE_ENDIAN
-+#ifndef X_LITTLE_ENDIAN
-+#define X_LITTLE_ENDIAN 1234
-+#endif
-+#ifndef X_BIG_ENDIAN
-+#define X_BIG_ENDIAN 4321
-+#endif
-+#if X_BYTE_ORDER == X_LITTLE_ENDIAN && defined(X_LITTLE_ENDIAN)
- #define IMAGE_BYTE_ORDER LSBFirst
- #define BITMAP_BIT_ORDER LSBFirst
--#elif X_BYTE_ORDER == X_BIG_ENDIAN
-+#elif X_BYTE_ORDER == X_BIG_ENDIAN && defined(X_BIG_ENDIAN)
- #define IMAGE_BYTE_ORDER MSBFirst
- #define BITMAP_BIT_ORDER MSBFirst
- #else