From 2b1774d2603292ee31a5577a48e67439040bc6b1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 16 Dec 2009 09:39:36 +0100 Subject: xorg: update listres, xlogo, xf86-input-evdev, xf86-input-synaptics, xf86-video-nv, liblbxutil, libpciaccess, util-macros, util-macros-native to latest versions Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 22 ++++----- recipes/xorg-app/listres_1.0.2.bb | 5 ++ recipes/xorg-app/xlogo_1.0.2.bb | 5 ++ recipes/xorg-driver/xf86-input-evdev_2.3.2.bb | 4 ++ recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb | 4 ++ recipes/xorg-driver/xf86-video-nv_2.1.16.bb | 4 ++ recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch | 55 ++++++++++++++++++++++ recipes/xorg-lib/liblbxutil_1.1.0.bb | 10 ++++ recipes/xorg-lib/libpciaccess_0.11.0.bb | 5 ++ .../malloc_zero_returns_null.patch | 27 +++++++++++ recipes/xorg-util/util-macros-native_1.4.1.bb | 7 +++ recipes/xorg-util/util-macros_1.4.1.bb | 8 ++++ recipes/xorg-xserver/xorg-xserver-common.inc | 2 +- 13 files changed, 146 insertions(+), 12 deletions(-) create mode 100644 recipes/xorg-app/listres_1.0.2.bb create mode 100644 recipes/xorg-app/xlogo_1.0.2.bb create mode 100644 recipes/xorg-driver/xf86-input-evdev_2.3.2.bb create mode 100644 recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb create mode 100644 recipes/xorg-driver/xf86-video-nv_2.1.16.bb create mode 100644 recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch create mode 100644 recipes/xorg-lib/liblbxutil_1.1.0.bb create mode 100644 recipes/xorg-lib/libpciaccess_0.11.0.bb create mode 100644 recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch create mode 100644 recipes/xorg-util/util-macros-native_1.4.1.bb create mode 100644 recipes/xorg-util/util-macros_1.4.1.bb diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 3d1ae5235f..7da1c16a2a 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Fri Dec 4 07:59:36 CET 2009 +#Wed Dec 16 09:33:47 CET 2009 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -13,7 +13,7 @@ PREFERRED_VERSION_fstobdf ?= "1.0.3" PREFERRED_VERSION_iceauth ?= "1.0.3" PREFERRED_VERSION_ico ?= "1.0.2" PREFERRED_VERSION_lbxproxy ?= "1.0.2" -PREFERRED_VERSION_listres ?= "1.0.1" +PREFERRED_VERSION_listres ?= "1.0.2" PREFERRED_VERSION_luit ?= "1.0.4" PREFERRED_VERSION_mkcfm ?= "1.0.1" PREFERRED_VERSION_mkcomposecache ?= "1.2.1" @@ -72,7 +72,7 @@ PREFERRED_VERSION_xkbprint ?= "1.0.2" PREFERRED_VERSION_xkbutils ?= "1.0.2" PREFERRED_VERSION_xkill ?= "1.0.2" PREFERRED_VERSION_xload ?= "1.0.2" -PREFERRED_VERSION_xlogo ?= "1.0.1" +PREFERRED_VERSION_xlogo ?= "1.0.2" PREFERRED_VERSION_xlsatoms ?= "1.0.2" PREFERRED_VERSION_xlsclients ?= "1.0.2" PREFERRED_VERSION_xlsfonts ?= "1.0.2" @@ -120,7 +120,7 @@ PREFERRED_VERSION_xf86-input-dmc ?= "1.1.2" PREFERRED_VERSION_xf86-input-dynapro ?= "1.1.2" PREFERRED_VERSION_xf86-input-elo2300 ?= "1.1.2" PREFERRED_VERSION_xf86-input-elographics ?= "1.2.3" -PREFERRED_VERSION_xf86-input-evdev ?= "2.3.1" +PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2" PREFERRED_VERSION_xf86-input-fpit ?= "1.3.0" PREFERRED_VERSION_xf86-input-hyperpen ?= "1.3.0" PREFERRED_VERSION_xf86-input-jamstudio ?= "1.2.0" @@ -135,7 +135,7 @@ PREFERRED_VERSION_xf86-input-palmax ?= "1.2.0" PREFERRED_VERSION_xf86-input-penmount ?= "1.4.0" PREFERRED_VERSION_xf86-input-spaceorb ?= "1.1.1" PREFERRED_VERSION_xf86-input-summa ?= "1.2.0" -PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.0" +PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1" PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0" PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0" PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5" @@ -162,7 +162,7 @@ PREFERRED_VERSION_xf86-video-mga ?= "1.9.100" PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4" PREFERRED_VERSION_xf86-video-newport ?= "0.2.3" PREFERRED_VERSION_xf86-video-nsc ?= "2.8.3" -PREFERRED_VERSION_xf86-video-nv ?= "2.1.15" +PREFERRED_VERSION_xf86-video-nv ?= "2.1.16" PREFERRED_VERSION_xf86-video-openchrome ?= "0.2.904" PREFERRED_VERSION_xf86-video-r128 ?= "6.8.1" PREFERRED_VERSION_xf86-video-radeonhd ?= "1.3.0" @@ -286,13 +286,13 @@ PREFERRED_VERSION_libxxf86vm ?= "1.1.0" PREFERRED_VERSION_libdmx ?= "1.1.0" PREFERRED_VERSION_libfontenc ?= "1.0.5" PREFERRED_VERSION_libfontenc-native ?= "1.0.5" -PREFERRED_VERSION_liblbxutil ?= "1.0.1" +PREFERRED_VERSION_liblbxutil ?= "1.1.0" PREFERRED_VERSION_liboldx ?= "1.0.1" -PREFERRED_VERSION_libpciaccess ?= "0.10.9" +PREFERRED_VERSION_libpciaccess ?= "0.11.0" PREFERRED_VERSION_libxkbfile ?= "1.0.6" PREFERRED_VERSION_libxkbfile-native ?= "1.0.6" PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_pixman ?= "0.17.2" +PREFERRED_VERSION_pixman ?= "0.16.2" PREFERRED_VERSION_xtrans ?= "1.2.5" PREFERRED_VERSION_xtrans-native ?= "1.2.5" #proto @@ -346,8 +346,8 @@ PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_lndir ?= "1.0.1" PREFERRED_VERSION_makedepend ?= "1.0.2" PREFERRED_VERSION_makedepend-native ?= "1.0.2" -PREFERRED_VERSION_util-macros ?= "1.3.0" -PREFERRED_VERSION_util-macros-native ?= "1.3.0" +PREFERRED_VERSION_util-macros ?= "1.4.1" +PREFERRED_VERSION_util-macros-native ?= "1.4.1" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver PREFERRED_VERSION_xserver-xorg ?= "1.7.3" diff --git a/recipes/xorg-app/listres_1.0.2.bb b/recipes/xorg-app/listres_1.0.2.bb new file mode 100644 index 0000000000..97fab10f3d --- /dev/null +++ b/recipes/xorg-app/listres_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw virtual/libx11 libxt libxmu" + diff --git a/recipes/xorg-app/xlogo_1.0.2.bb b/recipes/xorg-app/xlogo_1.0.2.bb new file mode 100644 index 0000000000..6090eba216 --- /dev/null +++ b/recipes/xorg-app/xlogo_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxaw libxprintutil libxp libxrender libxft libxext libxt" + diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb new file mode 100644 index 0000000000..792909621a --- /dev/null +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb b/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb new file mode 100644 index 0000000000..e6325675f8 --- /dev/null +++ b/recipes/xorg-driver/xf86-input-synaptics_1.2.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" diff --git a/recipes/xorg-driver/xf86-video-nv_2.1.16.bb b/recipes/xorg-driver/xf86-video-nv_2.1.16.bb new file mode 100644 index 0000000000..0d4ee2ed19 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-nv_2.1.16.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- NV display driver" +PE = "1" diff --git a/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch b/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch new file mode 100644 index 0000000000..f9f4a6382c --- /dev/null +++ b/recipes/xorg-lib/liblbxutil/mkg3states-1.1.patch @@ -0,0 +1,55 @@ +diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac +--- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100 ++++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100 +@@ -50,4 +50,5 @@ + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am +--- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100 +@@ -0,0 +1,15 @@ ++# evil hack ++CFLAGS=$(CFLAGS_FOR_BUILD) ++CPPFLAGS=$(CPPFLAGS_FOR_BUILD) ++LDFLAGS=$(LDFLAGS_FOR_BUILD) ++ ++CC=$(CC_FOR_BUILD) ++LIBTOOL = @LIBTOOL@ --tag=CC ++ ++noinst_PROGRAMS = mkg3states ++ ++mkg3states_SOURCES = \ ++ mkg3states.c ++ ++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) ++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) +diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am +--- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100 ++++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100 +@@ -3,10 +3,7 @@ + AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS) + INCLUDES = -I$(top_srcdir)/include + +-noinst_PROGRAMS = mkg3states +- +-mkg3states_SOURCES = \ +- $(srcdir)/image/mkg3states.c ++SUBDIRS = image + + liblbxutil_la_SOURCES = \ + $(srcdir)/lbx_zlib/reqstats.h \ +@@ -38,9 +35,8 @@ + + $(srcdir)/image/dfaxg42d.c: g3states.h + +-g3states.h: mkg3states +- -rm -f g3states.h +- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h ++g3states.h: image/mkg3states ++ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h + + liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined + diff --git a/recipes/xorg-lib/liblbxutil_1.1.0.bb b/recipes/xorg-lib/liblbxutil_1.1.0.bb new file mode 100644 index 0000000000..3221520f85 --- /dev/null +++ b/recipes/xorg-lib/liblbxutil_1.1.0.bb @@ -0,0 +1,10 @@ +require xorg-lib-common.inc + +DESCRIPTION = "XFIXES Extension" +DEPENDS += " xextproto xproto zlib" +PROVIDES = "lbxutil" +PE = "1" + +SRC_URI += "file://mkg3states-1.1.patch;patch=1" + +export CC_FOR_BUILD = "gcc" diff --git a/recipes/xorg-lib/libpciaccess_0.11.0.bb b/recipes/xorg-lib/libpciaccess_0.11.0.bb new file mode 100644 index 0000000000..26d1d95e35 --- /dev/null +++ b/recipes/xorg-lib/libpciaccess_0.11.0.bb @@ -0,0 +1,5 @@ +require xorg-lib-common.inc + +DEPENDS += "xproto virtual/libx11" + +PR="r1" diff --git a/recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch b/recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch new file mode 100644 index 0000000000..0d8a9cd9ec --- /dev/null +++ b/recipes/xorg-util/util-macros-1.4.1/malloc_zero_returns_null.patch @@ -0,0 +1,27 @@ +From 48e2b3d0ee8d637d83b88bf29c6d417f61aaa0e4 Mon Sep 17 00:00:00 2001 +From: Colin Watson +Date: Sat, 10 Oct 2009 12:28:28 +0000 +Subject: Use conservative default for malloc(0) when cross-compiling #24460 + +When cross-compiling, AC_RUN_IFELSE can't run test programs. +MALLOC_ZERO_RETURNS_NULL=yes is a conservative default in this case. + +Signed-off-by: Colin Watson +Signed-off-by: Gaetan Nadon +--- +diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in +index 6f9635f..393186f 100644 +--- a/xorg-macros.m4.in ++++ b/xorg-macros.m4.in +@@ -339,7 +339,8 @@ main() { + exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1); + }], + [MALLOC_ZERO_RETURNS_NULL=yes], +- [MALLOC_ZERO_RETURNS_NULL=no]) ++ [MALLOC_ZERO_RETURNS_NULL=no], ++ [MALLOC_ZERO_RETURNS_NULL=yes]) + fi + AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL]) + +-- +cgit v0.8.3-6-g21f6 diff --git a/recipes/xorg-util/util-macros-native_1.4.1.bb b/recipes/xorg-util/util-macros-native_1.4.1.bb new file mode 100644 index 0000000000..618e78f116 --- /dev/null +++ b/recipes/xorg-util/util-macros-native_1.4.1.bb @@ -0,0 +1,7 @@ +require util-macros_${PV}.bb + +inherit native + +XORG_PN = "util-macros" + +S = "${WORKDIR}/util-macros-${PV}" diff --git a/recipes/xorg-util/util-macros_1.4.1.bb b/recipes/xorg-util/util-macros_1.4.1.bb new file mode 100644 index 0000000000..7e0b7d5cc9 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.4.1.bb @@ -0,0 +1,8 @@ +require xorg-util-common.inc + +DESCRIPTION = "X autotools macros" +PE = "1" + +SRC_URI += " file://malloc_zero_returns_null.patch;patch=1" + +ALLOW_EMPTY = "1" diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc index c9b33768c6..a2a95b74cf 100644 --- a/recipes/xorg-xserver/xorg-xserver-common.inc +++ b/recipes/xorg-xserver/xorg-xserver-common.inc @@ -6,7 +6,7 @@ INC_PR = "r13" PROVIDES = "virtual/xserver" -DEPENDS = "hal fontconfig freetype flex-native kbproto \ +DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ -- cgit 1.2.3-korg