Author: pebender
Date: Tue Jul 7 17:03:10 2009
New Revision: 5131
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-perl.patch.gar
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-remove_moduledefaults.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-xdmcp.patch
Removed:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-duplicate_headers.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-perl.patch.gar
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-remove_moduledefaults.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.1-xdmcp.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile
trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums
Log:
- Updated package xorg-7.4/xorg-server.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Tue Jul 7
17:03:10 2009
@@ -232,6 +232,7 @@
Updated xorg-7.4/pixman.
Updated xorg-7.4/util-macros.
Updated xorg-7.4/xf86-video-savage.
+ Updated xorg-7.4/xorg-server.
Updated xorg-7.4/xproto.
--------------------------------------------------------------------------------
Modified: trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile Tue Jul 7
17:03:10 2009
@@ -1,10 +1,9 @@
GARNAME = xorg-server
-GARVERSION = 1.6.1
+GARVERSION = 1.6.2
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = \
- $(DISTNAME)-duplicate_headers.patch \
$(DISTNAME)-xdmcp.patch \
$(DISTNAME)-perl.patch.gar \
$(DISTNAME)-pkg_config.patch \
Modified: trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums Tue Jul 7
17:03:10 2009
@@ -1,6 +1,5 @@
-ed0878bf32a24d4948c3b8a122a39eff download/xorg-server-1.6.1.tar.bz2
-ccdbe325dbca6a3853d83567d6e9ef8d
download/xorg-server-1.6.1-duplicate_headers.patch
-30bb0607dd403b96dbf4b2589878cf57 download/xorg-server-1.6.1-xdmcp.patch
-06c5528e36e5e3d58db96bfeca969de6 download/xorg-server-1.6.1-perl.patch.gar
-4cb2f868f6b61fe70cb1e11254c44bf8
download/xorg-server-1.6.1-pkg_config.patch
-04d6c9e5e48967a5d078ea1c8ea067fe
download/xorg-server-1.6.1-remove_moduledefaults.patch
+37641d0899df8a9c4a6284586d932b8d download/xorg-server-1.6.2.tar.bz2
+acb6a328e1b13a1d94ac58bfc3461ee6 download/xorg-server-1.6.2-xdmcp.patch
+47b870052fcfdb0da8fd10152430d5f1 download/xorg-server-1.6.2-perl.patch.gar
+deae897af36bdead9a6cb72425453590
download/xorg-server-1.6.2-pkg_config.patch
+eaa33a9ed3efdaf4200dcf12b63f95cc
download/xorg-server-1.6.2-remove_moduledefaults.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-perl.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-perl.patch.gar
Tue Jul 7 17:03:10 2009
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.6.2-old/hw/dmx/doc/doxygen.conf
xorg-server-1.6.2-new/hw/dmx/doc/doxygen.conf
+--- xorg-server-1.6.2-old/hw/dmx/doc/doxygen.conf 2009-07-07
16:49:03.000000000 -0700
++++ xorg-server-1.6.2-new/hw/dmx/doc/doxygen.conf 2009-07-07
16:52:45.000000000 -0700
+@@ -945,7 +945,7 @@
+ # The PERL_PATH should be the absolute path and name of the perl script
+ # interpreter (i.e. the result of `which perl').
+
+-PERL_PATH = /usr/bin/perl
++PERL_PATH = @GAR_DESTDIR@@GAR_bindir@/perl
+
+
#---------------------------------------------------------------------------
+ # Configuration options related to the dot tool
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-pkg_config.patch
Tue Jul 7 17:03:10 2009
@@ -0,0 +1,15 @@
+diff -Naur xorg-server-1.6.2-old/xorg-server.m4
xorg-server-1.6.2-new/xorg-server.m4
+--- xorg-server-1.6.2-old/xorg-server.m4 2009-07-07 16:52:26.000000000
-0700
++++ xorg-server-1.6.2-new/xorg-server.m4 2009-07-07 16:53:30.000000000
-0700
+@@ -29,8 +29,10 @@
+ # is defined, then add $1 to $REQUIRED_MODULES.
+
+ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
++ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir
xorg-server`"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include "xorg-server.h"
+ #if !defined $1
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-remove_moduledefaults.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-remove_moduledefaults.patch
Tue Jul 7 17:03:10 2009
@@ -0,0 +1,20 @@
+diff -Naur xorg-server-1.6.2-old/hw/xfree86/common/xf86Config.c
xorg-server-1.6.2-new/hw/xfree86/common/xf86Config.c
+--- xorg-server-1.6.2-old/hw/xfree86/common/xf86Config.c 2009-07-07
16:52:59.000000000 -0700
++++ xorg-server-1.6.2-new/hw/xfree86/common/xf86Config.c 2009-07-07
16:54:31.000000000 -0700
+@@ -111,16 +111,6 @@
+ #endif
+
+ static ModuleDefault ModuleDefaults[] = {
+- {.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
+- {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
+- {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
+-#ifdef XRECORD
+- {.name = "record", .toLoad = TRUE, .load_opt=NULL},
+-#endif
+- {.name = "dri", .toLoad = TRUE, .load_opt=NULL},
+-#ifdef DRI2
+- {.name = "dri2", .toLoad = TRUE, .load_opt=NULL},
+-#endif
+ {.name = NULL, .toLoad = FALSE, .load_opt=NULL}
+ };
+
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-xdmcp.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.2-xdmcp.patch
Tue Jul 7 17:03:10 2009
@@ -0,0 +1,41 @@
+diff -Naur xorg-server-1.6.2-old/os/osdep.h
xorg-server-1.6.2-new/os/osdep.h
+--- xorg-server-1.6.2-old/os/osdep.h 2009-07-07 10:48:58.000000000 -0700
++++ xorg-server-1.6.2-new/os/osdep.h 2009-07-07 16:49:15.000000000 -0700
+@@ -56,7 +56,9 @@
+ #define BUFSIZE 4096
+ #define BUFWATERMARK 8192
+
++#if defined(XDMCP) || defined(HASXDMAUTH)
+ #include <X11/Xdmcp.h>
++#endif
+
+ #ifdef _POSIX_SOURCE
+ #include <limits.h>
+@@ -109,9 +111,11 @@
+
+ #include <stddef.h>
+
++#if defined(XDMCP) || defined(HASXDMAUTH)
+ typedef Bool (*ValidatorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int
packet_type);
+ typedef Bool (*GeneratorFunc)(ARRAY8Ptr Auth, ARRAY8Ptr Data, int
packet_type);
+ typedef Bool (*AddAuthorFunc)(unsigned name_length, char *name, unsigned
data_length, char *data);
++#endif
+
+ typedef struct _connectionInput {
+ struct _connectionInput *next;
+@@ -244,6 +248,7 @@
+ extern int SecureRPCReset (AuthRstCArgs);
+ #endif
+
++#ifdef XDMCP
+ /* in xdmcp.c */
+ extern void XdmcpUseMsg (void);
+ extern int XdmcpOptions(int argc, char **argv, int i);
+@@ -268,6 +273,7 @@
+
+ struct sockaddr_in;
+ extern void XdmcpRegisterBroadcastAddress (struct sockaddr_in *addr);
++#endif
+
+ #ifdef HASXDMAUTH
+ extern void XdmAuthenticationInit (char *cookie, int cookie_length);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
