Author: pebender
Date: Fri Jun 12 12:11:54 2009
New Revision: 4932
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-abstract_socket_fix.patch
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-cross.patch.gar
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-default_local_trans.patch
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
Removed:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.1.5-cross.patch.gar
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.1.5-xdmcp.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/html/minimyth/document-todo.txt
trunk/gar-minimyth/script/xorg-7.4/libX11/Makefile
trunk/gar-minimyth/script/xorg-7.4/libX11/checksums
trunk/gar-minimyth/script/xorg-7.4/xproto/Makefile
trunk/gar-minimyth/script/xorg-7.4/xproto/checksums
Log:
- Updated packages xorg-7.4/libX11 and xorg-7.4/xproto.
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 Fri Jun 12
12:11:54 2009
@@ -56,6 +56,8 @@
Updated system/lcdproc.
Updated system/zoneinfo.
Updated utils/findutils.
+ Updated xorg-7.4/libX11.
+ Updated xorg-7.4/xproto.
--------------------------------------------------------------------------------
Changes since 66 (2009-06-06):
Modified: trunk/gar-minimyth/html/minimyth/document-todo.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-todo.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-todo.txt Fri Jun 12 12:11:54
2009
@@ -1,12 +1,9 @@
Packages we will not update:
- devel/automake - 1.11 - fails when compiling
xorg-server 1.6.1.
- devel/glibc - 2.10.1 - fails when compliing
MythTV 0.21 freemheg.
- kde/kdelibs - 4.x.x - not compatible with Qt
3.3.x (requires Qt 4.3.x).
- xorg-7.4/xf86-video-openchrome - SVN 737 - breaks some composite
modelines:
-
<http://www.minimyth.org/forum/viewtopic.php?t=2210>.
+ devel/automake - 1.11 - fails when compiling
xorg-server 1.6.1.
+ devel/glibc - 2.10.1 - fails when compliing MythTV
0.21 freemheg.
+ kde/kdelibs - 4.x.x - not compatible with Qt
3.3.x (requires Qt 4.3.x).
+ xorg-7.4/xf86-video-openchrome - SVN 737 - breaks some composite
modelines:
+
<http://www.minimyth.org/forum/viewtopic.php?t=2210>.
Packages we may update:
- emulators/fceu - 2.0.x - requires SCons to build.
- xorg-7.4/libX11 - 1.2 - need to figure out why X
transport
- is broken.
- xorg-7.4/xproto - 7.0.15 - requires libX11 1.2.
+ emulators/fceu - 2.0.x - requires SCons to build.
Modified: trunk/gar-minimyth/script/xorg-7.4/libX11/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/libX11/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/libX11/Makefile Fri Jun 12 12:11:54
2009
@@ -1,9 +1,9 @@
GARNAME = libX11
-GARVERSION = 1.1.5
+GARVERSION = 1.2.1
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-xdmcp.patch $(DISTNAME)-cross.patch.gar
+PATCHFILES = $(DISTNAME)-abstract_socket_fix.patch
$(DISTNAME)-default_local_trans.patch $(DISTNAME)-xdmcp.patch
$(DISTNAME)-cross.patch.gar
LICENSE = $(GARNAME)
$(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING
Modified: trunk/gar-minimyth/script/xorg-7.4/libX11/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/libX11/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/libX11/checksums Fri Jun 12 12:11:54
2009
@@ -1,3 +1,5 @@
-d1512d65dadd4f48c779d4749e7753a8 download/libX11-1.1.5.tar.bz2
-8e056f577ab14142f2074db67baada3e download/libX11-1.1.5-xdmcp.patch
-d6d96efbee1877979c538032c2f287ed download/libX11-1.1.5-cross.patch.gar
+2f2beb98e71f397e1209beaca4e97cb1 download/libX11-1.2.1.tar.bz2
+1fdb49db3f176d8980a57fcf9f3946f6
download/libX11-1.2.1-abstract_socket_fix.patch
+d8b39bbee2be08cc40bbd58961bcf48a
download/libX11-1.2.1-default_local_trans.patch
+4dd7f1ff756e4887e0b039c308dbd6fc download/libX11-1.2.1-xdmcp.patch
+709164de3687de6145b8d3514c33ae51 download/libX11-1.2.1-cross.patch.gar
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-abstract_socket_fix.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-abstract_socket_fix.patch
Fri Jun 12 12:11:54 2009
@@ -0,0 +1,26 @@
+diff -Naur libX11-1.2.1-old/configure.ac libX11-1.2.1-new/configure.ac
+--- libX11-1.2.1-old/configure.ac 2009-04-07 15:18:30.000000000 -0700
++++ libX11-1.2.1-new/configure.ac 2009-06-12 11:29:06.000000000 -0700
+@@ -88,6 +88,10 @@
+ # Unix domain sockets are faster now.
+ DEFAULT_LOCAL_TRANS="UNIX_TRANS,LOCAL_TRANS,TCP_TRANS"
+ ;;
++ linux*)
++ # LOCAL_TRANS is used for abstract sockets.
++ DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
++ ;;
+ *)
+ if test "$LOCALCONN" = "yes"; then
+ DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
+diff -Naur libX11-1.2.1-old/src/ConnDis.c libX11-1.2.1-new/src/ConnDis.c
+--- libX11-1.2.1-old/src/ConnDis.c 2008-11-18 22:42:01.000000000 -0800
++++ libX11-1.2.1-new/src/ConnDis.c 2009-06-12 11:16:31.000000000 -0700
+@@ -93,7 +93,7 @@
+ #ifdef UNIXCONN
+ # define UNIX_TRANS "unix"
+ #endif
+-#if defined(LOCALCONN) || defined(OS2PIPECONN)
++#if defined(LOCALCONN) || defined(OS2PIPECONN) || defined(UNIXCONN)
+ # define LOCAL_TRANS "local"
+ #endif
+
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-cross.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-cross.patch.gar
Fri Jun 12 12:11:54 2009
@@ -0,0 +1,81 @@
+diff -Naur libX11-1.2.1-old/configure.ac libX11-1.2.1-new/configure.ac
+--- libX11-1.2.1-old/configure.ac 2009-06-12 11:40:13.000000000 -0700
++++ libX11-1.2.1-new/configure.ac 2009-06-12 11:41:56.000000000 -0700
+@@ -7,6 +7,9 @@
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
++
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+
+ AM_MAINTAINER_MODE
+@@ -33,6 +36,42 @@
+ fi
+ AC_SUBST([CC_FOR_BUILD])
+
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++ CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
++AC_MSG_CHECKING([for CPPFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD}
++else
++ CPPFLAGS_FOR_BUILD=${CPPFLAGS}
++fi
++AC_MSG_RESULT([$CPPFLAGS_FOR_BUILD])
++AC_SUBST(CPPFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for CFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++ CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD}
++else
++ CFLAGS_FOR_BUILD=${CFLAGS}
++fi
++AC_MSG_RESULT([$CFLAGS_FOR_BUILD])
++AC_SUBST(CFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for LDFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++ LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD}
++else
++ LDFLAGS_FOR_BUILD=${LDFLAGS}
++fi
++AC_MSG_RESULT([$LDFLAGS_FOR_BUILD])
++AC_SUBST(LDFLAGS_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+
+ # Build with XCB support?
+@@ -314,7 +353,7 @@
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+ dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++KEYSYMDEF="@gar_dest...@$dir/X11/keysymdef.h"
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+diff -Naur libX11-1.2.1-old/src/util/Makefile.am
libX11-1.2.1-new/src/util/Makefile.am
+--- libX11-1.2.1-old/src/util/Makefile.am 2009-06-12 11:29:29.000000000
-0700
++++ libX11-1.2.1-new/src/util/Makefile.am 2009-06-12 11:41:56.000000000
-0700
+@@ -6,6 +6,12 @@
+
+ CC = @CC_FOR_BUILD@
+
++CC = @CC_FOR_BUILD@
++CCLD = @CC_FOR_BUILD@
++CPPFLAGS = @CPPFLAGS_FOR_BUILD@
++CFLAGS = @CFLAGS_FOR_BUILD@
++LDFLAGS = @LDFLAGS_FOR_BUILD@
++
+ EXTRA_DIST = mkks.sh
+
+ if LINT
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-default_local_trans.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-default_local_trans.patch
Fri Jun 12 12:11:54 2009
@@ -0,0 +1,74 @@
+diff -Naur libX11-1.2.1-old/configure.ac libX11-1.2.1-new/configure.ac
+--- libX11-1.2.1-old/configure.ac 2009-06-12 11:29:06.000000000 -0700
++++ libX11-1.2.1-new/configure.ac 2009-06-12 11:38:09.000000000 -0700
+@@ -81,22 +81,64 @@
+
+ # Preferred order to try transports for local connections
+ AC_MSG_CHECKING([what order to try transports in for local connections])
++DEFAULT_LOCAL_TRANS=""
+ case $host_os in
+ solaris*)
+ # On Solaris 2.6 through 9, named pipes (LOCAL_TRANS) were
+ # faster than Unix domain sockets, but on Solaris 10 & later,
+ # Unix domain sockets are faster now.
+- DEFAULT_LOCAL_TRANS="UNIX_TRANS,LOCAL_TRANS,TCP_TRANS"
++ if test "$UNIXCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
++ fi
++ if test "$LOCALCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
++ fi
++ if test "$TCPCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
++ fi
+ ;;
+ linux*)
+ # LOCAL_TRANS is used for abstract sockets.
+- DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
++ if test "$UNIXCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++
DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS,UNIX_TRANS"
++ fi
++ if test "$TCPCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
++ fi
+ ;;
+ *)
+- if test "$LOCALCONN" = "yes"; then
+- DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
+- else
+- DEFAULT_LOCAL_TRANS="UNIX_TRANS,TCP_TRANS"
++ if test "$LOCALCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
++ fi
++ if test "$UNIXCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
++ fi
++ if test "$TCPCONN" = "yes" ; then
++ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
++ fi
++ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
+ fi
+ ;;
+ esac
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
Fri Jun 12 12:11:54 2009
@@ -0,0 +1,37 @@
+diff -Naur libX11-1.2.1-old/configure.ac libX11-1.2.1-new/configure.ac
+--- libX11-1.2.1-old/configure.ac 2009-04-07 15:18:30.000000000 -0700
++++ libX11-1.2.1-new/configure.ac 2009-06-12 08:45:52.000000000 -0700
+@@ -49,8 +49,18 @@
+ case "$ac_cv_use_xcb" in
+ no)
+ X11_REQUIRES="xau xcmiscproto bigreqsproto"
+- X11_EXTRA_DEPS="xau xdmcp"
+- PKG_CHECK_MODULES(XDMCP, xdmcp)
++ X11_EXTRA_DEPS="xau"
++ PKG_CHECK_MODULES(XDMCP, xdmcp,
++ AC_CHECK_LIB(Xdmcp, XdmcpWrap,
++ [
++ AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"],
[xdmauth="no"], [$XDMCP_LIBS])
++ X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp"
++ ],
++ [
++ XDMCP_CFLAGS=
++ XDMCP_LIBS=
++ ], [$XDMCP_LIBS]),
++ [AC_MSG_RESULT(no)])
+ AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"],
[$XDMCP_LIBS])
+ AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
+ ;;
+diff -Naur libX11-1.2.1-old/src/ConnDis.c libX11-1.2.1-new/src/ConnDis.c
+--- libX11-1.2.1-old/src/ConnDis.c 2008-11-18 22:42:01.000000000 -0800
++++ libX11-1.2.1-new/src/ConnDis.c 2009-06-12 08:43:34.000000000 -0700
+@@ -39,7 +39,9 @@
+ #include <X11/Xlibint.h>
+ #include <X11/Xtrans/Xtrans.h>
+ #include <X11/Xauth.h>
++#ifdef HASXDMAUTH
+ #include <X11/Xdmcp.h>
++#endif
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <unistd.h>
Modified: trunk/gar-minimyth/script/xorg-7.4/xproto/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xproto/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xproto/Makefile Fri Jun 12 12:11:54
2009
@@ -1,5 +1,5 @@
GARNAME = xproto
-GARVERSION = 7.0.13
+GARVERSION = 7.0.15
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
Modified: trunk/gar-minimyth/script/xorg-7.4/xproto/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/xproto/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/xproto/checksums Fri Jun 12 12:11:54
2009
@@ -1 +1 @@
-7d26f45dca52632712a696e0631dc17b download/xproto-7.0.13.tar.bz2
+1a2b31430d04340be2e49e8b6445e076 download/xproto-7.0.15.tar.bz2
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
