Author: pebender
Date: Sat Mar 14 20:43:01 2009
New Revision: 4473
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-perl.patch.gar
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-remove_moduledefaults.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-xdmcp.patch
Removed:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.3-drm.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.3-perl.patch.gar
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.3-pkg_config.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.3-remove_moduledefaults.patch
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.5.3-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 Sat Mar 14
20:43:01 2009
@@ -134,6 +134,7 @@
Updated xorg-7.4/xf86-input-void.
Updated xorg-7.4/xf86-video-ati.
Updated xorg-7.4/xf86-video-intel.
+ Updated xorg-7.4/xorg-server.
--------------------------------------------------------------------------------
Changes since 63 (2009-01-28):
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 Mar 14
20:43:01 2009
@@ -1,5 +1,5 @@
GARNAME = xorg-server
-GARVERSION = 1.5.3
+GARVERSION = 1.6.0
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
@@ -7,7 +7,6 @@
$(DISTNAME)-xdmcp.patch \
$(DISTNAME)-perl.patch.gar \
$(DISTNAME)-pkg_config.patch \
- $(DISTNAME)-drm.patch \
$(DISTNAME)-remove_moduledefaults.patch
LICENSE = $(GARNAME)
$(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING
@@ -16,10 +15,13 @@
define BLURB
endef
+# $(CATEGORY)/evieext \
+# $(CATEGORY)/xf86bigfontproto \
+# $(CATEGORY)/xf86miscproto \
+
DEPENDS = lang/c lib/openssl \
$(CATEGORY)/bigreqsproto \
$(CATEGORY)/damageproto \
- $(CATEGORY)/evieext \
$(CATEGORY)/fixesproto \
$(CATEGORY)/fontsproto \
$(CATEGORY)/glproto \
@@ -32,6 +34,7 @@
$(CATEGORY)/libXau \
$(CATEGORY)/libXext \
$(CATEGORY)/libXfont \
+ $(CATEGORY)/libXinerama \
$(CATEGORY)/libxkbfile \
$(CATEGORY)/Mesa \
$(CATEGORY)/pixman \
@@ -43,10 +46,8 @@
$(CATEGORY)/videoproto \
$(CATEGORY)/xcmiscproto \
$(CATEGORY)/xextproto \
- $(CATEGORY)/xf86bigfontproto \
$(CATEGORY)/xf86dgaproto \
$(CATEGORY)/xf86driproto \
- $(CATEGORY)/xf86miscproto \
$(CATEGORY)/xf86vidmodeproto \
$(CATEGORY)/xineramaproto \
$(CATEGORY)/xproto \
@@ -70,15 +71,13 @@
--disable-debug \
--disable-builddocs \
--enable-install-libxf86config \
- --disable-builtin-fonts \
--disable-null-root-cursor \
--enable-aiglx \
--disable-glx-tls \
--enable-registry \
--disable-composite \
- --enable-mitshm \
+ --enable-shm \
--disable-xres \
- --disable-xtrap \
--enable-record \
--enable-xv \
--enable-xvmc \
@@ -91,17 +90,12 @@
--disable-dri2 \
--enable-xinerama \
--enable-xf86vidmode \
- --enable-xf86misc \
--disable-xace \
+ --disable-xselinux \
--disable-xcsecurity \
- --disable-appgroup \
--disable-xcalibrate \
--disable-tslib \
- --disable-xevie \
- --disable-cup \
- --disable-evi \
--disable-multibuffer \
- --disable-fontcache \
--enable-dbe \
--enable-xf86bigfont \
--enable-dpms \
@@ -113,26 +107,15 @@
--disable-xvfb \
--disable-xnest \
--disable-xquartz \
- --disable-x11app \
+ --disable-standalone-xpbproxy \
--disable-xwin \
- --disable-xprint \
- --disable-xgl \
- --disable-xglx \
- --disable-xegl \
- --disable-mfb \
- --disable-cfb \
- --disable-afb \
--disable-kdrive \
--disable-xephyr \
--disable-xsdl \
--disable-xfake \
--disable-xfbdev \
- --disable-kdrive-vesa \
- --disable-freetype \
--disable-install-setuid \
--disable-secure-rpc \
- --disable-xorgcfg \
- --disable-kbd_mode \
--enable-unix-transport \
--disable-tcp-transport \
--disable-ipv6 \
@@ -156,7 +139,7 @@
@cd $(WORKSRC) ; autoreconf --verbose --install --force
@$(call FIX_LIBTOOL,$(WORKSRC)/configure)
@rm -f $(WORKSRC)/config.cache
- @echo "ac_cv_sys_linker_h=no" >> $(WORKSRC)/config.cache
+ @#echo "ac_cv_sys_linker_h=no" >> $(WORKSRC)/config.cache
@$(MAKECOOKIE)
post-install:
@@ -165,7 +148,6 @@
@rm -f $(DESTDIR)$(libdir)/xorg/modules/extensions/libextmod.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/extensions/libglx.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/extensions/librecord.la
- @rm -f $(DESTDIR)$(libdir)/xorg/modules/fonts/libfreetype.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/libexa.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/libfb.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/libint10.la
@@ -184,5 +166,4 @@
@rm -f $(DESTDIR)$(libdir)/xorg/modules/multimedia/tda9850_drv.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/multimedia/tda9885_drv.la
@rm -f $(DESTDIR)$(libdir)/xorg/modules/multimedia/uda1380_drv.la
- @sed -e 's%-I$(DESTDIR)$(includedir)%-I$${includedir}%g' -i
$(DESTDIR)$(libdir)/pkgconfig/xorg-server.pc
@$(MAKECOOKIE)
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 Mar 14
20:43:01 2009
@@ -1,6 +1,5 @@
-308971036e25250e7fe3cccfd5a120f8 download/xorg-server-1.5.3.tar.bz2
-cd8edf3c12e4cadcb7fb8d72583c4537 download/xorg-server-1.5.3-xdmcp.patch
-b43c7c8eded31e7cc1c55942383a514c download/xorg-server-1.5.3-perl.patch.gar
-8e948df2e0a77c13139581206c9081e5
download/xorg-server-1.5.3-pkg_config.patch
-e82043cd536177c4f8d61fc9e912cf99 download/xorg-server-1.5.3-drm.patch
-98f659eeb0e2a75f341a6409ab668f62
download/xorg-server-1.5.3-remove_moduledefaults.patch
+aafe73f5807ce8bb534727ecb72467c7 download/xorg-server-1.6.0.tar.bz2
+0d3b003cbb6415ee12fc33242b31ed74 download/xorg-server-1.6.0-xdmcp.patch
+ff69b5312bd98347be888d733fbe9f49 download/xorg-server-1.6.0-perl.patch.gar
+6135e120efb059fd834cd0674cf0e902
download/xorg-server-1.6.0-pkg_config.patch
+cd91ea51f09343b076930d25b6725099
download/xorg-server-1.6.0-remove_moduledefaults.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-perl.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-perl.patch.gar
Sat Mar 14 20:43:01 2009
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.6.0-old/hw/dmx/doc/doxygen.conf
xorg-server-1.6.0-new/hw/dmx/doc/doxygen.conf
+--- xorg-server-1.6.0-old/hw/dmx/doc/doxygen.conf 2009-03-14
12:02:30.000000000 -0700
++++ xorg-server-1.6.0-new/hw/dmx/doc/doxygen.conf 2009-03-14
12:03:35.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.0-pkg_config.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-pkg_config.patch
Sat Mar 14 20:43:01 2009
@@ -0,0 +1,15 @@
+diff -Naur xorg-server-1.6.0-old/xorg-server.m4
xorg-server-1.6.0-new/xorg-server.m4
+--- xorg-server-1.6.0-old/xorg-server.m4 2009-03-14 12:03:15.000000000
-0700
++++ xorg-server-1.6.0-new/xorg-server.m4 2009-03-14 12:04:07.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.0-remove_moduledefaults.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-remove_moduledefaults.patch
Sat Mar 14 20:43:01 2009
@@ -0,0 +1,20 @@
+diff -Naur xorg-server-1.6.0-old/hw/xfree86/common/xf86Config.c
xorg-server-1.6.0-new/hw/xfree86/common/xf86Config.c
+--- xorg-server-1.6.0-old/hw/xfree86/common/xf86Config.c 2009-03-14
12:03:52.000000000 -0700
++++ xorg-server-1.6.0-new/hw/xfree86/common/xf86Config.c 2009-03-14
12:08:26.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.0-xdmcp.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/xorg-server/files/xorg-server-1.6.0-xdmcp.patch
Sat Mar 14 20:43:01 2009
@@ -0,0 +1,41 @@
+diff -Naur xorg-server-1.6.0-old/os/osdep.h
xorg-server-1.6.0-new/os/osdep.h
+--- xorg-server-1.6.0-old/os/osdep.h 2008-11-14 13:27:05.000000000 -0800
++++ xorg-server-1.6.0-new/os/osdep.h 2009-03-14 12:02:44.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
-~----------~----~----~----~------~----~------~--~---
