Author: pebender
Date: Fri Jul 10 07:52:27 2009
New Revision: 5144
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-abstract_socket_fix.patch
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-cross.patch
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-default_local_trans.patch
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-xdmcp.patch
Removed:
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
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
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.4/libX11/Makefile
trunk/gar-minimyth/script/xorg-7.4/libX11/checksums
Log:
- Updated package xorg-7.4/libX11.
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 Jul 10
07:52:27 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 68 (2009-07-09):
+Changes since 68 (2009-07-10):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082 and
@@ -14,6 +14,9 @@
Fixed bugs
- Fixed a bug in the generation of the minimyth.conf.mk included in the
image.
+
+Updated packages
+ Updated xorg-7.4/libX11.
--------------------------------------------------------------------------------
Changes since 67 (2009-07-09):
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 Jul 10 07:52:27
2009
@@ -1,5 +1,5 @@
GARNAME = libX11
-GARVERSION = 1.2.1
+GARVERSION = 1.2.2
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
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 Jul 10 07:52:27
2009
@@ -1,5 +1,5 @@
-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
-bfd4b26a4349f0da512e90556f966001 download/libX11-1.2.1-xdmcp.patch
-7903a353fd173f055d8acd92b077018c download/libX11-1.2.1-cross.patch
+94cbee7fae2ddb92b2d80116af871f54 download/libX11-1.2.2.tar.bz2
+f1135b0fcefc8b137734400b4e083a17
download/libX11-1.2.2-abstract_socket_fix.patch
+dc877bb4414e6c4a24dd96f59b165264
download/libX11-1.2.2-default_local_trans.patch
+493d7f581530ed23f302bbf8603431b8 download/libX11-1.2.2-xdmcp.patch
+c57cc6dfd48bf18dcff193d7887242c6 download/libX11-1.2.2-cross.patch
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-abstract_socket_fix.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-abstract_socket_fix.patch
Fri Jul 10 07:52:27 2009
@@ -0,0 +1,26 @@
+diff -Naur libX11-1.2.2-old/configure.ac libX11-1.2.2-new/configure.ac
+--- libX11-1.2.2-old/configure.ac 2009-07-09 21:07:33.000000000 -0700
++++ libX11-1.2.2-new/configure.ac 2009-07-10 06:41:36.000000000 -0700
+@@ -93,6 +93,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.2-old/src/ConnDis.c libX11-1.2.2-new/src/ConnDis.c
+--- libX11-1.2.2-old/src/ConnDis.c 2009-04-07 02:28:44.000000000 -0700
++++ libX11-1.2.2-new/src/ConnDis.c 2009-07-10 06:41:36.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.2-cross.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-cross.patch
Fri Jul 10 07:52:27 2009
@@ -0,0 +1,72 @@
+diff -Naur libX11-1.2.2-old/configure.ac libX11-1.2.2-new/configure.ac
+--- libX11-1.2.2-old/configure.ac 2009-07-10 06:43:02.000000000 -0700
++++ libX11-1.2.2-new/configure.ac 2009-07-10 06:43:34.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
+@@ -28,6 +31,8 @@
+ DOLT
+ AC_PROG_CC
+ XORG_CWARNFLAGS
++PKG_PROG_PKG_CONFIG
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
+
+ if test x"$CC_FOR_BUILD" = x; then
+ if test x"$cross_compiling" = xyes; then
+@@ -38,6 +43,27 @@
+ fi
+ AC_SUBST([CC_FOR_BUILD])
+
++if test x"$CPPFLAGS_FOR_BUILD" = x; then
++ if test ! x"$cross_compiling" = xyes; then
++ CPPFLAGS_FOR_BUILD=${CPPFLAGS}
++ fi
++fi
++AC_SUBST(CPPFLAGS_FOR_BUILD)
++
++if test x"$CFLAGS_FOR_BUILD" = x; then
++ if test ! x"$cross_compiling" = xyes; then
++ CFLAGS_FOR_BUILD=${CFLAGS}
++ fi
++fi
++AC_SUBST(CFLAGS_FOR_BUILD)
++
++if test x"$LDFLAGS_FOR_BUILD" = x; then
++ if test ! x"$cross_compiling" = xyes; then
++ LDFLAGS_FOR_BUILD=${LDFLAGS}
++ fi
++fi
++AC_SUBST(LDFLAGS_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+
+ # Build with XCB support?
+@@ -317,7 +343,7 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
++dir=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`
+ KEYSYMDEF="$dir/X11/keysymdef.h"
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+diff -Naur libX11-1.2.2-old/src/util/Makefile.am
libX11-1.2.2-new/src/util/Makefile.am
+--- libX11-1.2.2-old/src/util/Makefile.am 2009-07-10 06:42:51.000000000
-0700
++++ libX11-1.2.2-new/src/util/Makefile.am 2009-07-10 06:43:34.000000000
-0700
+@@ -5,6 +5,9 @@
+ makekeys_CFLAGS=$(X11_CFLAGS)
+
+ CC = @CC_FOR_BUILD@
++CPPFLAGS = @CPPFLAGS_FOR_BUILD@
++CFLAGS = @CFLAGS_FOR_BUILD@
++LDFLAGS = @LDFLAGS_FOR_BUILD@
+
+ EXTRA_DIST = mkks.sh
+
Added:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-default_local_trans.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-default_local_trans.patch
Fri Jul 10 07:52:27 2009
@@ -0,0 +1,74 @@
+diff -Naur libX11-1.2.2-old/configure.ac libX11-1.2.2-new/configure.ac
+--- libX11-1.2.2-old/configure.ac 2009-07-10 06:41:36.000000000 -0700
++++ libX11-1.2.2-new/configure.ac 2009-07-10 06:42:33.000000000 -0700
+@@ -86,22 +86,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.2-xdmcp.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.2-xdmcp.patch
Fri Jul 10 07:52:27 2009
@@ -0,0 +1,38 @@
+diff -Naur libX11-1.2.2-old/configure.ac libX11-1.2.2-new/configure.ac
+--- libX11-1.2.2-old/configure.ac 2009-07-10 06:42:33.000000000 -0700
++++ libX11-1.2.2-new/configure.ac 2009-07-10 06:43:02.000000000 -0700
+@@ -54,9 +54,18 @@
+ case "$ac_cv_use_xcb" in
+ no)
+ X11_REQUIRES="xau xcmiscproto bigreqsproto"
+- X11_EXTRA_DEPS="xau xdmcp"
+- PKG_CHECK_MODULES(XDMCP, xdmcp)
+- AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"],
[$XDMCP_LIBS])
++ 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_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
+ ;;
+ *)
+diff -Naur libX11-1.2.2-old/src/ConnDis.c libX11-1.2.2-new/src/ConnDis.c
+--- libX11-1.2.2-old/src/ConnDis.c 2009-07-10 06:42:17.000000000 -0700
++++ libX11-1.2.2-new/src/ConnDis.c 2009-07-10 06:43:02.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>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
