Revision: 5559 Author: pebender Date: Sun Sep 27 20:28:39 2009 Log: - Updated package xorg-7.4/xorg-server.
http://code.google.com/p/minimyth/source/detail?r=5559 Added: /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-perl.patch.gar /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-pkg_config.patch /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-remove_moduledefaults.patch /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-xdmcp.patch Deleted: /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-perl.patch.gar /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-pkg_config.patch /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-remove_moduledefaults.patch /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-xdmcp.patch Modified: /trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile /trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-perl.patch.gar Sun Sep 27 20:28:39 2009 @@ -0,0 +1,12 @@ +diff -Naur xorg-server-1.6.4-old/hw/dmx/doc/doxygen.conf xorg-server-1.6.4-new/hw/dmx/doc/doxygen.conf +--- xorg-server-1.6.4-old/hw/dmx/doc/doxygen.conf 2009-09-27 20:24:16.000000000 -0700 ++++ xorg-server-1.6.4-new/hw/dmx/doc/doxygen.conf 2009-09-27 20:25:14.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 ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-pkg_config.patch Sun Sep 27 20:28:39 2009 @@ -0,0 +1,15 @@ +diff -Naur xorg-server-1.6.4-old/xorg-server.m4 xorg-server-1.6.4-new/xorg-server.m4 +--- xorg-server-1.6.4-old/xorg-server.m4 2009-09-27 20:24:59.000000000 -0700 ++++ xorg-server-1.6.4-new/xorg-server.m4 2009-09-27 20:25:49.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 ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-remove_moduledefaults.patch Sun Sep 27 20:28:39 2009 @@ -0,0 +1,20 @@ +diff -Naur xorg-server-1.6.4-old/hw/xfree86/common/xf86Config.c xorg-server-1.6.4-new/hw/xfree86/common/xf86Config.c +--- xorg-server-1.6.4-old/hw/xfree86/common/xf86Config.c 2009-09-27 20:25:34.000000000 -0700 ++++ xorg-server-1.6.4-new/hw/xfree86/common/xf86Config.c 2009-09-27 20:26:28.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} + }; + ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.4-xdmcp.patch Sun Sep 27 20:28:39 2009 @@ -0,0 +1,41 @@ +diff -Naur xorg-server-1.6.4-old/os/osdep.h xorg-server-1.6.4-new/os/osdep.h +--- xorg-server-1.6.4-old/os/osdep.h 2009-09-22 11:57:38.000000000 -0700 ++++ xorg-server-1.6.4-new/os/osdep.h 2009-09-27 20:24:39.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); ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-perl.patch.gar Sat Aug 1 07:52:20 2009 +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xorg-server-1.6.3-old/hw/dmx/doc/doxygen.conf xorg-server-1.6.3-new/hw/dmx/doc/doxygen.conf ---- xorg-server-1.6.3-old/hw/dmx/doc/doxygen.conf 2009-08-01 06:58:32.000000000 -0700 -+++ xorg-server-1.6.3-new/hw/dmx/doc/doxygen.conf 2009-08-01 06:59:18.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 ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-pkg_config.patch Sat Aug 1 07:52:20 2009 +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur xorg-server-1.6.3-old/xorg-server.m4 xorg-server-1.6.3-new/xorg-server.m4 ---- xorg-server-1.6.3-old/xorg-server.m4 2009-08-01 06:59:06.000000000 -0700 -+++ xorg-server-1.6.3-new/xorg-server.m4 2009-08-01 06:59:47.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 ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-remove_moduledefaults.patch Sat Aug 1 07:52:20 2009 +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur xorg-server-1.6.3-old/hw/xfree86/common/xf86Config.c xorg-server-1.6.3-new/hw/xfree86/common/xf86Config.c ---- xorg-server-1.6.3-old/hw/xfree86/common/xf86Config.c 2009-08-01 06:59:40.000000000 -0700 -+++ xorg-server-1.6.3-new/hw/xfree86/common/xf86Config.c 2009-08-01 07:00:16.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} - }; - ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.3-xdmcp.patch Sat Aug 1 07:52:20 2009 +++ /dev/null @@ -1,41 +0,0 @@ -diff -Naur xorg-server-1.6.3-old/os/osdep.h xorg-server-1.6.3-new/os/osdep.h ---- xorg-server-1.6.3-old/os/osdep.h 2009-07-07 10:48:58.000000000 -0700 -+++ xorg-server-1.6.3-new/os/osdep.h 2009-08-01 06:58:40.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); ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile Sat Aug 1 07:52:20 2009 +++ /trunk/gar-minimyth/script/xorg-7.4/xorg-server/Makefile Sun Sep 27 20:28:39 2009 @@ -1,5 +1,5 @@ GARNAME = xorg-server -GARVERSION = 1.6.3 +GARVERSION = 1.6.4 CATEGORIES = $(CATEGORY) MASTER_SITES = $(XORG_MASTER_SITES) DISTFILES = $(DISTNAME).tar.bz2 ======================================= --- /trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums Sat Aug 1 07:52:20 2009 +++ /trunk/gar-minimyth/script/xorg-7.4/xorg-server/checksums Sun Sep 27 20:28:39 2009 @@ -1,5 +1,5 @@ -0af168abeefa6579cab20387f75c0c7a download/xorg-server-1.6.3.tar.bz2 -c961caa50a5c5abdf5daf37f023506fc download/xorg-server-1.6.3-xdmcp.patch -316a12f6136cf95cda98ba07849c2768 download/xorg-server-1.6.3-perl.patch.gar -bae464b5a9a5fd00ceb630c60f447b79 download/xorg-server-1.6.3-pkg_config.patch -03ec698a1dbb44e75d92d72e8855d311 download/xorg-server-1.6.3-remove_moduledefaults.patch +cde6b52e43560ae81d46cafa2282cb8c download/xorg-server-1.6.4.tar.bz2 +2448fe8b03ba0230ba1229c9f8996037 download/xorg-server-1.6.4-xdmcp.patch +c3c0d540db646472e3277600860f9b0d download/xorg-server-1.6.4-perl.patch.gar +c12589daedf510e6ae7690ce1566df01 download/xorg-server-1.6.4-pkg_config.patch +4f6a31ee197a275fc7888469273ec4cb download/xorg-server-1.6.4-remove_moduledefaults.patch --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
