diff --git a/xorg/xorg-server/glxbyteorder.h.patch b/xorg/xorg-server/glxbyteorder.h.patch deleted file mode 100644 index 5413c644d..000000000 --- a/xorg/xorg-server/glxbyteorder.h.patch +++ /dev/null @@ -1,90 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../xorg-server/glxbyteorder.h.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./GL/glx/Makefile.in.orig 2007-08-31 11:10:54.000000000 -0400 -+++ ./GL/glx/Makefile.in 2007-08-31 11:12:54.000000000 -0400 -@@ -405,6 +405,7 @@ - - libglx_la_SOURCES = \ - g_disptab.h \ -+ glxbyteorder.h \ - glxcmds.c \ - glxcmdsswap.c \ - glxcontext.h \ ---- /dev/null 2007-08-30 20:46:07.000000000 -0400 -+++ ./GL/glx/glxbyteorder.h 2007-08-31 12:50:35.000000000 -0400 -@@ -0,0 +1,61 @@ -+/* -+ * (C) Copyright IBM Corporation 2006, 2007 -+ * All Rights Reserved. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sub license, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -+ * THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS BE LIABLE FOR -+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/** -+ * \file glxbyteorder.h -+ * Platform glue for handling byte-ordering issues in GLX protocol. -+ * -+ * \author Ian Romanick -+ */ -+#if !defined(__GLXBYTEORDER_H__) -+#define __GLXBYTEORDER_H__ -+ -+#ifdef HAVE_DIX_CONFIG_H -+#include -+#endif -+ -+#if HAVE_BYTESWAP_H -+#include -+#elif defined(USE_SYS_ENDIAN_H) -+#include -+#elif defined(__APPLE__) -+#include -+#define bswap_16 OSSwapInt16 -+#define bswap_32 OSSwapInt32 -+#define bswap_64 OSSwapInt64 -+#else -+#define bswap_16(value) \ -+ ((((value) & 0xff) << 8) | ((value) >> 8)) -+ -+#define bswap_32(value) \ -+ (((uint32_t)bswap_16((uint16_t)((value) & 0xffff)) << 16) | \ -+ (uint32_t)bswap_16((uint16_t)((value) >> 16))) -+ -+#define bswap_64(value) \ -+ (((uint64_t)bswap_32((uint32_t)((value) & 0xffffffff)) \ -+ << 32) | \ -+ (uint64_t)bswap_32((uint32_t)((value) >> 32))) -+#endif -+ -+#endif /* !defined(__GLXBYTEORDER_H__) */ diff --git a/xorg/xorg-server/pixman-0.9.4.patch b/xorg/xorg-server/pixman-0.9.4.patch deleted file mode 100644 index 9a5ae33e4..000000000 --- a/xorg/xorg-server/pixman-0.9.4.patch +++ /dev/null @@ -1,71 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../xorg-server/pixman-0.9.4.patch -# Copyright (C) 2007 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./configure.orig 2007-08-31 10:48:19.000000000 -0400 -+++ ./configure 2007-08-31 10:49:26.000000000 -0400 -@@ -27805,7 +27805,7 @@ - XEXT_LIB='$(top_builddir)/Xext/libXext.la' - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - --PIXMAN="pixman >= 0.9.2" -+PIXMAN="pixman-1 >= 0.9.4" - - REQUIRED_MODULES="randrproto >= 1.2 renderproto fixesproto >= 4.0 damageproto >= 1.1 xcmiscproto xextproto xproto >= 7.0.9 xtrans scrnsaverproto >= 1.1 bigreqsproto resourceproto fontsproto inputproto >= 1.4.2 kbproto >= 1.0.3" - REQUIRED_LIBS="xfont xau fontenc $PIXMAN" ---- ./fb/fb.h.orig 2007-08-31 10:55:07.000000000 -0400 -+++ ./fb/fb.h 2007-08-31 11:01:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #define _FB_H_ - - #include --#include -+#include - - #include "scrnintstr.h" - #include "pixmap.h" ---- ./mi/miregion.c.orig 2007-08-31 10:55:07.000000000 -0400 -+++ ./mi/miregion.c 2007-08-31 11:01:43.000000000 -0400 -@@ -85,7 +85,7 @@ - #include "gc.h" - #include "mi.h" - #include "mispans.h" --#include -+#include - - #undef assert - #ifdef DEBUG ---- ./render/picture.h.orig 2007-08-31 10:55:07.000000000 -0400 -+++ ./render/picture.h 2007-08-31 11:01:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #ifndef _PICTURE_H_ - #define _PICTURE_H_ - --#include -+#include - - typedef struct _DirectFormat *DirectFormatPtr; - typedef struct _PictFormat *PictFormatPtr; ---- ./include/miscstruct.h.orig 2007-08-31 10:55:07.000000000 -0400 -+++ ./include/miscstruct.h 2007-08-31 11:01:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include "misc.h" - #include - #include "gc.h" --#include -+#include - - typedef xPoint DDXPointRec; - diff --git a/xorg/xorg-server/xorg-server.desc b/xorg/xorg-server/xorg-server.desc index 50cce6701..48b50b73f 100644 --- a/xorg/xorg-server/xorg-server.desc +++ b/xorg/xorg-server/xorg-server.desc @@ -27,9 +27,9 @@ [L] OpenSource [S] Stable -[V] 1.3.99.0 +[V] 1.3.99.2 [P] X -----5---9 112.560 [O] . package/*/*/modular-x-conf.in -[D] 2301499134 xorg-server-1.3.99.0.tar.bz2 http://xorg.freedesktop.org/releases/individual/xserver/ +[D] 3237301875 xorg-server-1.3.99.2.tar.bz2 http://xorg.freedesktop.org/releases/individual/xserver/