Author: pebender
Date: Sat Oct 11 22:29:03 2008
New Revision: 3827
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-drm.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-perl.patch.gar
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-remove_moduledefaults.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-xdmcp.patch
Removed:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.1-drm.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.1-perl.patch.gar
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.1-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.1-remove_moduledefaults.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.1-xdmcp.patch
Modified:
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/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 Sat Oct 11
22:29:03 2008
@@ -1,5 +1,5 @@
GARNAME = xorg-server
-GARVERSION = 1.5.1
+GARVERSION = 1.5.2
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
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 Sat Oct 11
22:29:03 2008
@@ -1,6 +1,6 @@
-d16f5a033f001c9069b4141194614da2 download/xorg-server-1.5.1.tar.bz2
-47c550d12eb7ffccdec6f1492cfe6bd7 download/xorg-server-1.5.1-xdmcp.patch
-108f90616d0f152b3759c5d5574c7971 download/xorg-server-1.5.1-perl.patch.gar
-84ef63745df1c6467af83f3a8015eba9
download/xorg-server-1.5.1-pkg_config.patch
-df06ed00611689387f3a3cf57f76cbf8 download/xorg-server-1.5.1-drm.patch
-7ba326dfd773ebed0b257b6af7c5014a
download/xorg-server-1.5.1-remove_moduledefaults.patch
+376a1c790f7519f3ab3e047409c659f0 download/xorg-server-1.5.2.tar.bz2
+bdbc0835f3864cf5b9e1a651ea1afa41 download/xorg-server-1.5.2-xdmcp.patch
+99ce40c6d1bcc8d8a9a96c8d7db2900c download/xorg-server-1.5.2-perl.patch.gar
+5fdb1d7e945ebb467aea213969f29012
download/xorg-server-1.5.2-pkg_config.patch
+a5add60463ebfa5b222ed5636d72da27 download/xorg-server-1.5.2-drm.patch
+55d12c4215278843a4fe57b5f07eebc1
download/xorg-server-1.5.2-remove_moduledefaults.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-drm.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-drm.patch
Sat Oct 11 22:29:03 2008
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.5.2-old/hw/xfree86/os-support/linux/Makefile.am
xorg-server-1.5.2-new/hw/xfree86/os-support/linux/Makefile.am
+--- xorg-server-1.5.2-old/hw/xfree86/os-support/linux/Makefile.am
2008-10-11 21:34:10.000000000 -0700
++++ xorg-server-1.5.2-new/hw/xfree86/os-support/linux/Makefile.am
2008-10-11 21:34:57.000000000 -0700
+@@ -40,7 +40,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS)
$(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME
this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-perl.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-perl.patch.gar
Sat Oct 11 22:29:03 2008
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.5.2-old/hw/dmx/doc/doxygen.conf
xorg-server-1.5.2-new/hw/dmx/doc/doxygen.conf
+--- xorg-server-1.5.2-old/hw/dmx/doc/doxygen.conf 2008-10-11
21:32:49.000000000 -0700
++++ xorg-server-1.5.2-new/hw/dmx/doc/doxygen.conf 2008-10-11
21:33:54.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.5.2-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-pkg_config.patch
Sat Oct 11 22:29:03 2008
@@ -0,0 +1,28 @@
+diff -Naur xorg-server-1.5.2-old/configure.ac
xorg-server-1.5.2-new/configure.ac
+--- xorg-server-1.5.2-old/configure.ac 2008-10-11 21:33:36.000000000 -0700
++++ xorg-server-1.5.2-new/configure.ac 2008-10-11 21:34:23.000000000 -0700
+@@ -2048,7 +2048,8 @@
+ AC_SUBST(XORGCFG_DEP_CFLAGS)
+ AC_SUBST(XORGCFG_DEP_LIBS)
+
+- APPDEFAULTDIR=$(pkg-config --variable=appdefaultdir xt)
++ m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++ APPDEFAULTDIR=$PKG_CONFIG_SYSROOT_DIR$($PKG_CONFIG
--variable=appdefaultdir xt)
+ AC_SUBST(APPDEFAULTDIR)
+ fi
+ AM_CONDITIONAL(BUILD_XORGCFG, [test x$XORGCFG = xyes])
+diff -Naur xorg-server-1.5.2-old/xorg-server.m4
xorg-server-1.5.2-new/xorg-server.m4
+--- xorg-server-1.5.2-old/xorg-server.m4 2008-10-11 21:33:36.000000000
-0700
++++ xorg-server-1.5.2-new/xorg-server.m4 2008-10-11 21:34:23.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.5.2-remove_moduledefaults.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-remove_moduledefaults.patch
Sat Oct 11 22:29:03 2008
@@ -0,0 +1,21 @@
+diff -Naur xorg-server-1.5.2-old/hw/xfree86/common/xf86Config.c
xorg-server-1.5.2-new/hw/xfree86/common/xf86Config.c
+--- xorg-server-1.5.2-old/hw/xfree86/common/xf86Config.c 2008-10-11
21:34:44.000000000 -0700
++++ xorg-server-1.5.2-new/hw/xfree86/common/xf86Config.c 2008-10-11
21:35:26.000000000 -0700
+@@ -115,17 +115,6 @@
+ static char *fontPath = NULL;
+
+ static ModuleDefault ModuleDefaults[] = {
+- {.name = "extmod", .toLoad = TRUE, .load_opt=NULL},
+- {.name = "dbe", .toLoad = TRUE, .load_opt=NULL},
+- {.name = "glx", .toLoad = TRUE, .load_opt=NULL},
+- {.name = "freetype", .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.5.2-xdmcp.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.2-xdmcp.patch
Sat Oct 11 22:29:03 2008
@@ -0,0 +1,41 @@
+diff -Naur xorg-server-1.5.2-old/os/osdep.h
xorg-server-1.5.2-new/os/osdep.h
+--- xorg-server-1.5.2-old/os/osdep.h 2008-10-10 11:12:49.000000000 -0700
++++ xorg-server-1.5.2-new/os/osdep.h 2008-10-11 21:33:06.000000000 -0700
+@@ -56,7 +56,9 @@
+ #define BUFSIZE 4096
+ #define BUFWATERMARK 8192
+
++#if defined(XDMCP) || defined(HASXDMAUTH)
+ #include <X11/Xdmcp.h>
++#endif
+
+ #ifndef sgi /* SGI defines OPEN_MAX in a useless way */
+ #ifndef X_NOT_POSIX
+@@ -122,9 +124,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;
+@@ -257,6 +261,7 @@
+ extern int SecureRPCReset (AuthRstCArgs);
+ #endif
+
++#ifdef XDMCP
+ /* in xdmcp.c */
+ extern void XdmcpUseMsg (void);
+ extern int XdmcpOptions(int argc, char **argv, int i);
+@@ -281,6 +286,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
-~----------~----~----~----~------~----~------~--~---
