From e9345f1dd29b225ccf98ec8bed51e317c114b843 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 --- conf/checksums.ini | 32 +++++++++++++ .../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 +- 14 files changed, 178 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/checksums.ini b/conf/checksums.ini index 8fc614beb3..1f76481579 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -15566,6 +15566,10 @@ sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25 md5=b73cbd5bc3cd268722a624a5f1318fde sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258 +[http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.1.0.tar.bz2] +md5=273329a78c2e9ea189ac416c7fde94a1 +sha256=c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae + [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/liblbxutil-X11R7.0-1.0.0.tar.bz2] md5=1bcffde85723f78243d1ba60e1ebaef6 sha256=e485f36d74f477f3d235a05bb67b502dc744092569842d9ab45e2f785f74f556 @@ -16122,6 +16126,10 @@ sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce md5=685cb20e7a6165bc010972f1183addbd sha256=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead +[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.11.0.tar.bz2] +md5=686320dcec98daad0bdfb8894d4f2a2b +sha256=6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab + [http://www.xmailserver.org/libpcl-1.4.tar.gz] md5=6d63c462911349de80109c0161ed6d37 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686 @@ -17518,6 +17526,10 @@ sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db md5=827a1ac5adf9aadd0c13b54a897e297b sha256=7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3 +[http://xorg.freedesktop.org/releases/individual/app/listres-1.0.2.tar.bz2] +md5=3c0d5d8d6abaf411cd0647bc7073ac38 +sha256=4d9e24b95619bc961936d241106ffcc483995de55629567113ad78ba0b37ffb7 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/listres-X11R7.0-1.0.1.tar.bz2] md5=2eeb802272a7910bb8a52b308bf0d5f6 sha256=41711ff3c94144b8a561146948b9b5fd49a55756532fa4d254d9a959e6622d87 @@ -26942,6 +26954,10 @@ sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401 md5=51bb54c08415ee3c3000b7df9e9b07c5 sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67 +[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.4.1.tar.gz] +md5=8ac38951e753f250aaefbd4ba0afda94 +sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986 + [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2] md5=bc6be634532d4936eb753de54e1663d3 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd @@ -28474,6 +28490,10 @@ sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8 md5=e56ce4424b89b2409c6e73e007a85da7 sha256=462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.2.tar.bz2] +md5=b2bfe368022eedf2671ee28daba31efc +sha256=029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28 + [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2] md5=d982c6f185f4c75a4b65703ceed7be06 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4 @@ -28790,6 +28810,10 @@ sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b md5=2cf0a2b0b3006bcfcd85bb77d966244a sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c +[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.1.tar.bz2] +md5=29a6f9da5123149e4abc8ff83880ed5c +sha256=a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6 + [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2] md5=be8a4bd474ad6c85b93f66dd6fcfa6ee sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727 @@ -29294,6 +29318,10 @@ sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e md5=1b22188bd9012a148206940708b52ea6 sha256=c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641 +[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.16.tar.bz2] +md5=fb02d5506e35054348d1c2b2c924530d +sha256=4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d + [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2] md5=f9b38e24157c3aac6014119ac18d76da sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952 @@ -30546,6 +30574,10 @@ sha256=400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 md5=4c5482552f38a7d42398a694cc9b2ee6 sha256=de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2 +[http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.2.tar.bz2] +md5=7365c0852750134119734bc1879f60ca +sha256=47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130 + [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlogo-X11R7.0-1.0.1.tar.bz2] md5=0314b2f5173da64957031400638fa5f8 sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131 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 From 5ff293416fd38957ff883f2abaca5fa0438fab39 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 16 Dec 2009 11:42:03 +0100 Subject: xf86-input-evdev_2.3.0: drop increased preference for shr as we want newer evdev thant 2.3.0 Signed-off-by: Martin Jansa --- recipes/xorg-driver/xf86-input-evdev_2.3.0.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb b/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb index 9160df5b6e..1e66108501 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb +++ b/recipes/xorg-driver/xf86-input-evdev_2.3.0.bb @@ -4,4 +4,3 @@ DESCRIPTION = "X.Org X server -- evdev input driver" PE = "1" DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" -- cgit 1.2.3-korg