Pull request for branch xorg-bump-versions
The following changes since commit e63fd15e202a3e5e6ee8d5ecb181610fc2d07f45:
Peter Korsgaard (1):
Merge branch 'xconfig-documentation' of git://git.busybox.net/~tpetazzoni/git/buildroot
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot xorg-bump-versions
Thomas Petazzoni (4):
xorg: bump libXt to 1.0.6
xorg: bump X.org server version to 1.5.3
xorg: bump version of xutil/macros to 1.2.2
xorg: add a new cross-compile fix for libXt 1.0.6
.../xlib_libXt-1.0.5-makestrs-nocc.patch | 52 -------------------- .../xlib_libXt-1.0.6-cross-compile-fix.patch | 28 +++++++++++ package/x11r7/xlib_libXt/xlib_libXt.mk | 5 +- .../xserver_xorg-server/xserver_xorg-server.mk | 2 +- .../xutil_util-macros-1.1.6-linuxdoc.patch | 15 ------ .../xutil_util-macros-1.1.6.patch | 8 --- .../xutil_util-macros-1.2.2.patch | 16 ++++++ .../x11r7/xutil_util-macros/xutil_util-macros.mk | 2 +- 8 files changed, 49 insertions(+), 79 deletions(-) delete mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.5-makestrs-nocc.patch create mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch delete mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch delete mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch create mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.2.2.patch
Thanks,
Signature · 1 line
Thomas Petazzoni
PATCH 1/4 xorg: bump libXt to 1.0.6
Bump libXt to 1.0.6 and remove the xlib_libXt-1.0.5-makestrs-nocc.patch, which has been included in a better form in upstream:
http://cgit.freedesktop.org/xorg/lib/libXt/commit/?id=36e9f0d351afbf7fd2595990b2d39e7c551f6420
--- .../xlib_libXt-1.0.5-makestrs-nocc.patch | 52 -------------------- package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +- 2 files changed, 1 insertions(+), 53 deletions(-) delete mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.5-makestrs-nocc.patch
package/x11r7/xlib_libXt/xlib_libXt-1.0.5-makestrs-nocc.patch deleted +0 -52
@@ -1,52 +0,0 @@ ---- - util/Makefile.in | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -Index: libXt-1.0.5/util/Makefile.in -=================================================================== ---- libXt-1.0.5.orig/util/Makefile.in -+++ libXt-1.0.5/util/Makefile.in -@@ -64,8 +64,11 @@ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) -+HOST_CC = gcc - LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+makestrs_LINK = $(HOST_CC) \ -+ $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ - SOURCES = $(makestrs_SOURCES) - DIST_SOURCES = $(makestrs_SOURCES) - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -@@ -297,7 +300,7 @@ - done - makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) - @rm -f makestrs$(EXEEXT) -- $(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS) -+ $(makestrs_LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -329,18 +332,18 @@ - @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - - makestrs-makestrs.o: makestrs.c -- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \ -+ at am__fastdepCC_TRUE@ if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c -+ at am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c - - makestrs-makestrs.obj: makestrs.c -- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \ -+ at am__fastdepCC_TRUE@ if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` -+@am__fastdepCC_FALSE@ $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi` - - mostlyclean-libtool: - -rm -f *.lo
package/x11r7/xlib_libXt/xlib_libXt.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXT_VERSION = 1.0.5 +XLIB_LIBXT_VERSION = 1.0.6 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXT_AUTORECONF = NO
Signature · 1 line
1.6.0.4
PATCH 2/4 xorg: bump X.org server version to 1.5.3
In reply to Thomas PetazzoniThis version contains a fix to allow the compilation of the Xvesa server against recent versions of the kernel headers (fix
http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.5-branch&id=992a7168f0db5733fe4a6cbd2f40c6b1f2a150e0)
--- .../xserver_xorg-server/xserver_xorg-server.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.5.2 +XSERVER_XORG_SERVER_VERSION = 1.5.3 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver XSERVER_XORG_SERVER_AUTORECONF = NO
Signature · 1 line
1.6.0.4
PATCH 3/4 xorg: bump version of xutil/macros to 1.2.2
In reply to Thomas PetazzoniThis version bump is required by the bump of xlib_libXt from 1.0.5 to 1.0.6 (1.0.6 requires at least xutil/macros 1.2).
The linuxdoc patch is removed, since it has been merged upstream, at
http://cgit.freedesktop.org/xorg/util/macros/commit/?id=e20c503d24e5ccf03035aa0f6d833d235d2179df
The other patch exposing STAGING_DIR is kept, as it is Buildroot specific. It has just been updated to resolve conflicts.
--- .../xutil_util-macros-1.1.6-linuxdoc.patch | 15 --------------- .../xutil_util-macros-1.1.6.patch | 8 -------- .../xutil_util-macros-1.2.2.patch | 16 ++++++++++++++++ .../x11r7/xutil_util-macros/xutil_util-macros.mk | 2 +- 4 files changed, 17 insertions(+), 24 deletions(-) delete mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch delete mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch create mode 100644 package/x11r7/xutil_util-macros/xutil_util-macros-1.2.2.patch
package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6-linuxdoc.patch deleted +0 -15
@@ -1,15 +0,0 @@ ---- util-macros-1.1.6/xorg-macros.m4.in.orig 2007-06-08 22:23:00.000000000 +0200 -+++ util-macros-1.1.6/xorg-macros.m4.in 2007-06-08 22:26:41.000000000 +0200 -@@ -194,7 +194,11 @@ - XORG_SGML_PATH=$prefix/share/sgml - HAVE_DEFS_ENT= - --AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -+if test "$cross_compiling" = no; then -+ AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes]) -+else -+ HAVE_DEFS_ENT=no -+fi - - AC_PATH_PROG(LINUXDOC, linuxdoc) - AC_PATH_PROG(PS2PDF, ps2pdf)
package/x11r7/xutil_util-macros/xutil_util-macros-1.1.6.patch deleted +0 -8
@@ -1,8 +0,0 @@ ---- util-macros-1.1.6/xorg-macros.m4.in.orig 2007-06-10 11:34:17.000000000 +0200 -+++ util-macros-1.1.6/xorg-macros.m4.in 2007-06-10 11:34:20.000000000 +0200 -@@ -423,3 +423,5 @@ - AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) - - ]) # XORG_LINT_LIBRARY -+ -+AC_SUBST(STAGING_DIR)
package/x11r7/xutil_util-macros/xutil_util-macros-1.2.2.patch new file +16 -0
@@ -0,0 +1,16 @@ +--- + xorg-macros.m4.in | 3 +++ + 1 file changed, 3 insertions(+) + +Index: xutil_util-macros-1.2.2/xorg-macros.m4.in +=================================================================== +--- xutil_util-macros-1.2.2.orig/xorg-macros.m4.in ++++ xutil_util-macros-1.2.2/xorg-macros.m4.in +@@ -459,3 +459,6 @@ + fi + AC_SUBST(CWARNFLAGS) + ]) # XORG_CWARNFLAGS ++ ++# Buildroot stuff ++AC_SUBST(STAGING_DIR) +\ No newline at end of file
package/x11r7/xutil_util-macros/xutil_util-macros.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -XUTIL_UTIL_MACROS_VERSION = 1.1.6 +XUTIL_UTIL_MACROS_VERSION = 1.2.2 XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util XUTIL_UTIL_MACROS_AUTORECONF = NO
Signature · 1 line
1.6.0.4
PATCH 4/4 xorg: add a new cross-compile fix for libXt 1.0.6
In reply to Thomas PetazzoniThe cross-compile fix included in mainline of libXt between 1.0.5 and 1.0.6 is not sufficient. It allows to pass a different compiler for the host tools, but still uses the TARGET_CFLAGS/TARGET_LDFLAGS to compile the host tools, which obviously isn't correct.
The new patch allows to use the CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD variables as the CFLAGS/LDFLAGS to build the host tools.
--- .../xlib_libXt-1.0.6-cross-compile-fix.patch | 28 ++++++++++++++++++++ package/x11r7/xlib_libXt/xlib_libXt.mk | 3 +- 2 files changed, 30 insertions(+), 1 deletions(-) create mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch
package/x11r7/xlib_libXt/xlib_libXt-1.0.6-cross-compile-fix.patch new file +28 -0
@@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 043ab5f..cb00a41 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -48,6 +48,10 @@ if test x"$CC_FOR_BUILD" = x; then + fi + fi + AC_SUBST([CC_FOR_BUILD]) ++CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} ++AC_SUBST(CFLAGS_FOR_BUILD) ++LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} ++AC_SUBST(LDFLAGS_FOR_BUILD) + + PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) + +diff --git a/util/Makefile.am b/util/Makefile.am +index 0d3ff01..37b78d2 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -5,6 +5,8 @@ noinst_PROGRAMS = makestrs + endif + + CC = @CC_FOR_BUILD@ ++CFLAGS = @CFLAGS_FOR_BUILD@ ++LDFLAGS = @LDFLAGS_FOR_BUILD@ + + EXTRA_DIST = \ + Shell.ht \
package/x11r7/xlib_libXt/xlib_libXt.mk +2 -1
@@ -7,7 +7,8 @@ XLIB_LIBXT_VERSION = 1.0.6 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXT_AUTORECONF = NO +XLIB_LIBXT_AUTORECONF = YES +XLIB_LIBXT_LIBTOOL_PATCH = NO XLIB_LIBXT_INSTALL_STAGING = YES XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
Signature · 1 line
1.6.0.4
PATCH 4/4 xorg: add a new cross-compile fix for libXt 1.0.6
Le Tue, 28 Jul 2009 11:55:15 +0200,
Thomas Petazzoni <[email protected]> a ?crit :
Quoted 7 lines
The cross-compile fix included in mainline of libXt between 1.0.5 and 1.0.6 is not sufficient. It allows to pass a different compiler for the host tools, but still uses the TARGET_CFLAGS/TARGET_LDFLAGS to compile the host tools, which obviously isn't correct.
The new patch allows to use the CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD variables as the CFLAGS/LDFLAGS to build the host tools.
Patch submitted upstream, at
https://bugs.freedesktop.org/show_bug.cgi?id=23001
Sincerly,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 4/4 xorg: add a new cross-compile fix for libXt 1.0.6
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Patch submitted upstream, at
Thomas> https://bugs.freedesktop.org/show_bug.cgi?id=23001
Great, thanks!
Signature · 1 line
Bye, Peter Korsgaard
PATCH 4/4 xorg: add a new cross-compile fix for libXt 1.0.6
In reply to Thomas PetazzoniLe Tue, 28 Jul 2009 12:10:39 +0200,
Thomas Petazzoni <[email protected]> a ?crit :
Quoted 2 lines
Patch submitted upstream, at
https://bugs.freedesktop.org/show_bug.cgi?id=23001
Patch merged upstream:
http://bugs.freedesktop.org/show_bug.cgi?id=23001#c1
http://cgit.freedesktop.org/xorg/lib/libXt/commit/?id=f77482f0618f954de1d080599ada058e9a3c24ff
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
Le Tue, 28 Jul 2009 11:55:11 +0200,
Thomas Petazzoni <[email protected]> a ?crit :
Quoted 5 lines
Thomas Petazzoni (4):
xorg: bump libXt to 1.0.6
xorg: bump X.org server version to 1.5.3
xorg: bump version of xutil/macros to 1.2.2
xorg: add a new cross-compile fix for libXt 1.0.6
I've added a 5th patch on top of this, just to update the CHANGES file to mark bug #171 as fixed.
Should I resend the pull request with the patches ?
Thanks,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Le Tue, 28 Jul 2009 11:55:11 +0200,
Thomas> Thomas Petazzoni <[email protected]> a ?crit :
Quoted 5 lines
Quoted 5 lines
Thomas Petazzoni (4):
xorg: bump libXt to 1.0.6
xorg: bump X.org server version to 1.5.3
xorg: bump version of xutil/macros to 1.2.2
xorg: add a new cross-compile fix for libXt 1.0.6
Thomas> I've added a 5th patch on top of this, just to update the CHANGES file Thomas> to mark bug #171 as fixed.
Thomas> Should I resend the pull request with the patches ?
No, it's fine - Pulled and pushed.
Signature · 1 line
Bye, Peter Korsgaard